adb: use asocket's close function when closing.
close_all_sockets was assuming that all registered local sockets used local_socket_close as their close function. However, this is not true for JDWP sockets. Bug: http://b/28347842 Change-Id: I40a1174845cd33f15f30ce70828a7081cd5a087e (cherry picked from commit53eb31d87c
) (cherry picked from commit014b01706c
)
This commit is contained in:
parent
6f641adea5
commit
f71c01493a
|
@ -43,8 +43,6 @@
|
|||
using std::recursive_mutex;
|
||||
#endif
|
||||
|
||||
static void local_socket_close(asocket* s);
|
||||
|
||||
static recursive_mutex& local_socket_list_lock = *new recursive_mutex();
|
||||
static unsigned local_socket_next_id = 1;
|
||||
|
||||
|
@ -128,7 +126,7 @@ void close_all_sockets(atransport *t)
|
|||
restart:
|
||||
for (s = local_socket_list.next; s != &local_socket_list; s = s->next) {
|
||||
if (s->transport == t || (s->peer && s->peer->transport == t)) {
|
||||
local_socket_close(s);
|
||||
s->close(s);
|
||||
goto restart;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue