openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

am: 6c54561d1e

Change-Id: I1a7572937842cf8a80a518e61681c4c88c7285f7
This commit is contained in:
Josh Gao 2017-03-10 21:07:24 +00:00 committed by android-build-merger
parent cdd682d0e7 6c54561d1e
commit d90f42943e
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) {