diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-15 16:14:56 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-12-17 10:16:23 -0800 |
| commit | fa542091e45db699a937c5ac0191194405107827 (patch) | |
| tree | a09af98504fb8287e825fa96778d7df481eb4caa /luni/src/main/java/libcore | |
| parent | ae5e913146e8840b1e692f92299473268f90f415 (diff) | |
| download | libcore-fa542091e45db699a937c5ac0191194405107827.zip libcore-fa542091e45db699a937c5ac0191194405107827.tar.gz libcore-fa542091e45db699a937c5ac0191194405107827.tar.bz2 | |
Fix poll to never return EINTR.
Bug: 18759467
Change-Id: Ia5b97a55318b5990ad6b80d15641223aa4fb06f5
Diffstat (limited to 'luni/src/main/java/libcore')
| -rw-r--r-- | luni/src/main/java/libcore/io/IoBridge.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/luni/src/main/java/libcore/io/IoBridge.java b/luni/src/main/java/libcore/io/IoBridge.java index acc8d4f..fcb30dd 100644 --- a/luni/src/main/java/libcore/io/IoBridge.java +++ b/luni/src/main/java/libcore/io/IoBridge.java @@ -225,11 +225,7 @@ public final class IoBridge { if (!fd.valid()) { throw new SocketException("Socket closed"); } - if (errnoException.errno == EINTR) { - return false; // Punt and ask the caller to try again. - } else { - cause = errnoException; - } + cause = errnoException; } String detail = connectDetail(inetAddress, port, timeoutMs, cause); if (cause.errno == ETIMEDOUT) { |