commit 60ecb04e3287895568107bcd7212c9b15d8a9548
author Josh Gao <jmgao@google.com> Mon Mar 20 20:11:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 20 20:11:39 2017 +0000
tree 32c09a5cae9fffc610f85a5c78fe97d8595ab3e1
parent c46e64cf6817ee626e76d976ba98b770f7927eb5
parent def7f619ebb49ac234adce976126a93a1c3a5d26

Merge "adb: detect closed jdwp socket." am: e1c4e04f82 am: 7e5b10b18c
am: abd78b0058

Change-Id: I9cc87256a9611bdcf9fa58b11bbe0b65fd64cce6

adb/jdwp_service.cpp

diff --git a/adb/jdwp_service.cpp b/adb/jdwp_service.cpp
index 9589d88..af911bf 100644
--- a/adb/jdwp_service.cpp
+++ b/adb/jdwp_service.cpp
@@ -232,11 +232,7 @@
             size_t size = PID_LEN - proc->in_len;
 
             ssize_t rc = TEMP_FAILURE_RETRY(recv(socket, p, size, 0));
-            if (rc < 0) {
-                if (errno == EAGAIN) {
-                    return;
-                }
-
+            if (rc <= 0) {
                 D("failed to read jdwp pid: %s", strerror(errno));
                 goto CloseProcess;
             }