commit 78fb45493a898fac41e403132b7e5ab282c13fff
author Josh Gao <jmgao@google.com> Fri Mar 10 21:03:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 10 21:03:53 2017 +0000
tree 71e27225a86226118d97a97fcd045d6022c0c246
parent 4863bb06b6f327eaf4edf2ec3496007d50ddcf32
parent 71db838e87be6e99ff3cb5f62ae6a3a730c6a110

Merge "adb: properly erase destroyed jdwp_trackers." am: e02eba8fd2
am: b0e8bbfc99

Change-Id: I4c6b3d1acb3b75a2fce6d850b256b15c823c3de1

adb/jdwp_service.cpp

diff --git a/adb/jdwp_service.cpp b/adb/jdwp_service.cpp
index 3135aa4..9589d88 100644
--- a/adb/jdwp_service.cpp
+++ b/adb/jdwp_service.cpp
@@ -571,7 +571,8 @@
     remove_socket(s);
 
     auto pred = [s](const auto& tracker) { return tracker.get() == s; };
-    std::remove_if(_jdwp_trackers.begin(), _jdwp_trackers.end(), pred);
+    _jdwp_trackers.erase(std::remove_if(_jdwp_trackers.begin(), _jdwp_trackers.end(), pred),
+                         _jdwp_trackers.end());
 }
 
 static void jdwp_tracker_ready(asocket* s) {