Bug 1571405 - Remove "Active connection not found" assertion from nsHttpConnectionMgr::OnMsgReclaimConnection for being too excessive, r=kershaw

Differential Revision: https://phabricator.services.mozilla.com/D40632

--HG--
extra : moz-landing-system : lando

netwerk/protocol/http/nsHttpConnectionMgr.cpp

@@ -2794,7 +2794,6 @@ void nsHttpConnectionMgr::OnMsgReclaimConnection(int32_t, ARefBase* param) {
                                ? mCT.GetWeak(conn->ConnectionInfo()->HashKey())
                                : nullptr;
 
-  DebugOnly<bool> newEntry = false;
   if (!ent) {
     // this can happen if the connection is made outside of the
     // connection manager and is being "reclaimed" for use with
@@ -2804,8 +2803,6 @@ void nsHttpConnectionMgr::OnMsgReclaimConnection(int32_t, ARefBase* param) {
         ("nsHttpConnectionMgr::OnMsgReclaimConnection conn %p "
          "forced new hash entry %s\n",
          conn, conn->ConnectionInfo()->HashKey().get()));
-
-    newEntry = true;
   }
 
   MOZ_ASSERT(ent);
@@ -2848,21 +2845,16 @@ void nsHttpConnectionMgr::OnMsgReclaimConnection(int32_t, ARefBase* param) {
     anonInvertedCI->SetAnonymous(!ci->GetAnonymous());
 
     nsConnectionEntry* ent = mCT.GetWeak(anonInvertedCI->HashKey());
-    if (ent && ent->mActiveConns.RemoveElement(conn)) {
-      DecrementActiveConnCount(conn);
-      ConditionallyStopTimeoutTick();
-    } else {
-      LOG(
-          ("nsHttpConnection %p could not be removed from its entry's active "
-           "list",
-           conn));
-
-      // nsHttpConnectionMgr::AbortAndCloseAllConnections may race with this
-      // event handling.  It wipes and throws away all conn entries.  Then it's
-      // obviously fine that we can't find this connection anywhere.
-      MOZ_ASSERT(newEntry,
-                 "Active connection not found in a pre-existing entry nor "
-                 "^anonymous entry");
+    if (ent) {
+      if (ent->mActiveConns.RemoveElement(conn)) {
+        DecrementActiveConnCount(conn);
+        ConditionallyStopTimeoutTick();
+      } else {
+        LOG(
+            ("nsHttpConnection %p could not be removed from its entry's active "
+             "list",
+             conn));
+      }
     }
   }