| commit | 2749dc23f6006bf8902ad6333fe12a1a3c9281e0 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jun 29 22:32:19 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jun 29 22:32:19 2015 +0000 |
| tree | fe1ae4ed159ff84433c658bcdac2864b46daa389 | |
| parent | 617df090a9ec0f3e38619e4ffd447be3dad39f07 [diff] | |
| parent | 75b2471cc403e51337c3502ab2090906a0d35389 [diff] |
Merge "adb server: don't close stale fd when TCP transport is closed"
diff --git a/adb/transport_local.cpp b/adb/transport_local.cpp index d3c4c30..97e3d50 100644 --- a/adb/transport_local.cpp +++ b/adb/transport_local.cpp
@@ -331,7 +331,11 @@ static void remote_close(atransport *t) { - adb_close(t->fd); + int fd = t->sfd; + if (fd != -1) { + t->sfd = -1; + adb_close(fd); + } }