From 8a4f547dadecb1ec4e1647e0ca1ad74be3048801 Mon Sep 17 00:00:00 2001 From: Guo-wei Shieh Date: Fri, 30 Oct 2015 09:12:34 -0700 Subject: [PATCH] Hang on android when DNS resolution is not done BUG=webrtc:5139 R=juberti@google.com TBR=juberti@webrtc.org Review URL: https://codereview.webrtc.org/1429493009 . Cr-Commit-Position: refs/heads/master@{#10463} --- webrtc/p2p/base/stunport.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webrtc/p2p/base/stunport.cc b/webrtc/p2p/base/stunport.cc index 1598fe43ce..c0a8975152 100644 --- a/webrtc/p2p/base/stunport.cc +++ b/webrtc/p2p/base/stunport.cc @@ -116,7 +116,10 @@ UDPPort::AddressResolver::AddressResolver( UDPPort::AddressResolver::~AddressResolver() { for (ResolverMap::iterator it = resolvers_.begin(); it != resolvers_.end(); ++it) { - it->second->Destroy(true); + // TODO(guoweis): Change to asynchronous DNS resolution to prevent the hang + // when passing true to the Destroy() which is a safer way to avoid the code + // unloaded before the thread exits. Please see webrtc bug 5139. + it->second->Destroy(false); } }