ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: b0e8bbfc99

Change-Id: I4c6b3d1acb3b75a2fce6d850b256b15c823c3de1
This commit is contained in:
Josh Gao 2017-03-10 21:03:53 +00:00 • committed by android-build-merger
commit 6c54561d1e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
adb/jdwp_service.cpp
View file

@ -571,7 +571,8 @@ static void jdwp_tracker_close(asocket* s) {
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) {