commit 71db838e87be6e99ff3cb5f62ae6a3a730c6a110
author Josh Gao <jmgao@google.com> Fri Mar 10 21:00:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 10 21:00:23 2017 +0000
tree 71e27225a86226118d97a97fcd045d6022c0c246
parent 0c49aa0f3f24fc542a63da9bb8b5d4d3f7b1c3f9
parent cd838c7545ca2edee3ea33b33e93cf23f6240e0c

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

Change-Id: Ia87892fecebc64198b70acf089aa7eac3652175e

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