Backed out changeset a4b43a47589a (bug 1498782) for causing multimple failures e.g.: ts_paint_webext CLOSED TREE
authorMargareta Eliza Balazs <ebalazs@mozilla.com>
Wed, 17 Oct 2018 12:19:00 +0300
changeset 490022 86474265d1630457d800c782f6ec072af87cccd3
parent 490021 41a19ac5f495117bd9cfbb0dc7e8e3fbe6f17c13
child 490023 2d2cb65d5099338233ccaf0908863ed7382b12a1
push id247
push userfmarier@mozilla.com
push dateSat, 27 Oct 2018 01:06:44 +0000
bugs1498782
milestone64.0a1
backs outa4b43a47589a481f19fd60184881ed5d8caddd73
Backed out changeset a4b43a47589a (bug 1498782) for causing multimple failures e.g.: ts_paint_webext CLOSED TREE
netwerk/dns/nsHostResolver.cpp
--- a/netwerk/dns/nsHostResolver.cpp
+++ b/netwerk/dns/nsHostResolver.cpp
@@ -865,22 +865,17 @@ nsHostResolver::Shutdown()
 #endif
 
     {
         mozilla::DebugOnly<nsresult> rv = GetAddrInfoShutdown();
         NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
                              "Failed to shutdown GetAddrInfo");
     }
 
-    // It is possible that there are still threads waiting on a very slow DNS
-    // query. In that case, it's better just to skip the thread shutdown,
-    // or we might trigger the shutdownhang reporter.
-    if (mActiveTaskCount == 0) {
-        mResolverThreads->Shutdown();
-    }
+    mResolverThreads->Shutdown();
 }
 
 nsresult
 nsHostResolver::GetHostRecord(const nsACString &host, uint16_t type,
                               uint16_t flags, uint16_t af, bool pb,
                               const nsCString &originSuffix,
                               nsHostRecord **result)
 {