commit e82e6620aeb1e260804abcc9e523924b24672b33
author Josh Gao <jmgao@google.com> Mon Mar 20 19:57:14 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 20 19:57:15 2017 +0000
tree 82745e07e4df983cd186fe0fc0937bbabdda6311
parent ebd8196c192431838a5fd11c1afcbcf298ad4bfa
parent 23d64fd0cc56c38d1dfebc528874c8582ce73f26

Merge "adb: detect closed jdwp socket."

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;
             }