diff options
| author | Neil Fuller <nfuller@google.com> | 2014-04-23 16:41:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-23 16:41:39 +0000 |
| commit | 4d402932d370f12f43045518dac4eeef542648c4 (patch) | |
| tree | 8a0fa042ea7b2a59cdbfb3fcc1d305e8402dadbd /luni/src/main/java/java/net/InetAddress.java | |
| parent | 2e667679740a2a204b7f0566d2ba334b3fb2acc1 (diff) | |
| parent | f0d40d662d9dfdb04215c718961765837d2cf00c (diff) | |
| download | libcore-4d402932d370f12f43045518dac4eeef542648c4.zip libcore-4d402932d370f12f43045518dac4eeef542648c4.tar.gz libcore-4d402932d370f12f43045518dac4eeef542648c4.tar.bz2 | |
Merge "libcore changes to support asynchronous close interruption"
Diffstat (limited to 'luni/src/main/java/java/net/InetAddress.java')
| -rw-r--r-- | luni/src/main/java/java/net/InetAddress.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/luni/src/main/java/java/net/InetAddress.java b/luni/src/main/java/java/net/InetAddress.java index 98ad098..885b472 100644 --- a/luni/src/main/java/java/net/InetAddress.java +++ b/luni/src/main/java/java/net/InetAddress.java @@ -28,8 +28,6 @@ import java.io.Serializable; import java.nio.ByteOrder; import java.util.Arrays; import java.util.Collections; -import java.util.Comparator; -import java.util.Enumeration; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; @@ -734,7 +732,7 @@ public class InetAddress implements Serializable { } } - IoBridge.closeSocket(fd); + IoBridge.closeAndSignalBlockedThreads(fd); return reached; } |