Bug 1360332 - Part 1: avoid calling FailDiversion() twice; r?dragana draft
authorLiang-Heng Chen <xeonchen@gmail.com>
Wed, 14 Jun 2017 11:59:16 +0800
changeset 593787 474b5673e5f40fef85253db04d39d87f6dfcd47f
parent 593786 b1d1df56384998d1432871ac80c5325ba970043c
child 633207 f20cebf94797f75276299548c30895ebc732d8c8
push id63802
push userbmo:xeonchen@mozilla.com
push dateWed, 14 Jun 2017 04:00:15 +0000
reviewersdragana
bugs1360332
milestone56.0a1
Bug 1360332 - Part 1: avoid calling FailDiversion() twice; r?dragana MozReview-Commit-ID: DxI3c3223hJ
netwerk/protocol/http/HttpChannelParent.cpp
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -1917,24 +1917,22 @@ HttpChannelParent::ResumeForDiversion()
   }
 
   mChannel->MessageDiversionStop();
 
   if (mSuspendedForDiversion) {
     // The nsHttpChannel will deliver remaining OnData/OnStop for the transfer.
     nsresult rv = mChannel->ResumeInternal();
     if (NS_WARN_IF(NS_FAILED(rv))) {
-      FailDiversion(NS_ERROR_UNEXPECTED, true);
       return rv;
     }
     mSuspendedForDiversion = false;
   }
 
   if (NS_WARN_IF(mIPCClosed || !DoSendDeleteSelf())) {
-    FailDiversion(NS_ERROR_UNEXPECTED);
     return NS_ERROR_UNEXPECTED;
   }
   return NS_OK;
 }
 
 void
 HttpChannelParent::DivertTo(nsIStreamListener *aListener)
 {