commit 7b982cc94fcbb74b9b506ff81f670e72e8afa743
author Neil Fuller <nfuller@google.com> Tue Aug 14 10:30:21 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 14 10:30:21 2018 +0000
tree bb29d7b610ee7128392dbdc2c9eba0d86225ad9d
parent 99c0166e30d83e6e3a3349301de3eec2c56676cc
parent 4b9281b295ed30d8b9ef7af10cc196c52a04e145

Merge "Remove libcore usage of IoUtils.close()"

luni/src/main/java/libcore/io/IoBridge.java

diff --git a/luni/src/main/java/libcore/io/IoBridge.java b/luni/src/main/java/libcore/io/IoBridge.java
index 338400b..8c1e7cb 100644
--- a/luni/src/main/java/libcore/io/IoBridge.java
+++ b/luni/src/main/java/libcore/io/IoBridge.java
@@ -229,10 +229,11 @@
     }
 
     /**
-     * Closes the Unix file descriptor associated with the supplied file descriptor and sends a
-     * signal to any threads are currently blocking. In order for the signal to be sent the blocked
-     * threads must have registered with the AsynchronousCloseMonitor before they entered the
-     * blocking operation. {@code fd} will be invalid after this call.
+     * Closes the Unix file descriptor associated with the supplied file descriptor, resets the
+     * internal int to -1, and sends a signal to any threads are currently blocking. In order for
+     * the signal to be sent the blocked threads must have registered with the
+     * AsynchronousCloseMonitor before they entered the blocking operation. {@code fd} will be
+     * invalid after this call.
      *
      * <p>This method is a no-op if passed a {@code null} or already-closed file descriptor.
      */
@@ -481,7 +482,7 @@
         } catch (ErrnoException errnoException) {
             try {
                 if (fd != null) {
-                    IoUtils.close(fd);
+                    closeAndSignalBlockedThreads(fd);
                 }
             } catch (IOException ignored) {
             }