commit bd1f19cd6b4085fbf9ddc2b8e97948f8b81a952a
author Narayan Kamath <narayan@google.com> Mon Feb 22 15:02:56 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 22 15:02:56 2016 +0000
tree 3dd85b615319a065e3751e16c11a1707243c1fda
parent a57da64a2361d9a5af26c558738e5957729233cc
parent 3893bf863a2ee2b5d90c1ec83320bdf1598cbf97

Merge "io_util: Avoid early return in fileOpen."

ojluni/src/main/native/io_util_md.c

diff --git a/ojluni/src/main/native/io_util_md.c b/ojluni/src/main/native/io_util_md.c
index 4b1de48..430e983 100755
--- a/ojluni/src/main/native/io_util_md.c
+++ b/ojluni/src/main/native/io_util_md.c
@@ -86,10 +86,10 @@
               close(fd);
               errno = EISDIR; // For Exception message
               throwFileNotFoundException(env, path);
-              return;
+            } else {
+              // END android
+              SET_FD(this, fd, fid);
             }
-            // END android
-            SET_FD(this, fd, fid);
         } else {
             throwFileNotFoundException(env, path);
         }