bug 378637 part 15 - pipeline::setconnection(nullptr) is never assertable r=hurley
authorPatrick McManus <mcmanus@ducksong.com>
Fri, 16 May 2014 11:46:13 -0400
changeset 183610 9cbd4cf8ce64
parent 183609 3e4ecea736c3
child 183611 aac9539a4a0a
push id26799
push userphilringnalda@gmail.com
push date2014-05-18 00:55 +0000
treeherdermozilla-central@00ef3a7d7aa7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershurley
bugs378637
milestone32.0a1
bug 378637 part 15 - pipeline::setconnection(nullptr) is never assertable r=hurley
netwerk/protocol/http/nsHttpPipeline.cpp
--- a/netwerk/protocol/http/nsHttpPipeline.cpp
+++ b/netwerk/protocol/http/nsHttpPipeline.cpp
@@ -403,17 +403,17 @@ nsHttpPipeline::TakeSubTransactions(
 //-----------------------------------------------------------------------------
 
 void
 nsHttpPipeline::SetConnection(nsAHttpConnection *conn)
 {
     LOG(("nsHttpPipeline::SetConnection [this=%p conn=%x]\n", this, conn));
 
     MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-    MOZ_ASSERT(!mConnection, "already have a connection");
+    MOZ_ASSERT(!conn || !mConnection, "already have a connection");
 
     NS_IF_ADDREF(mConnection = conn);
 }
 
 nsAHttpConnection *
 nsHttpPipeline::Connection()
 {
     LOG(("nsHttpPipeline::Connection [this=%p conn=%x]\n", this, mConnection));