commit cd838c7545ca2edee3ea33b33e93cf23f6240e0c
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 10 20:54:50 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 10 20:54:51 2017 +0000
tree a9eb7bcd0d5ace81c41dc3c04105e5831148f785
parent 853acfa3474488dbb5dbab700ed8c8c4bec15b79
parent de8cdd3fce16da3364dd4185ddc349bce962b8ae

Merge "adb: properly erase destroyed jdwp_trackers."

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) {