Backing out because of unit test failure: [Exception... "Component returned failure code: 0x80470002 (NS_BASE_STREAM_CLOSED) [nsIZipWriter.addEntryStream]" nsresult: "0x80470002 (NS_BASE_STREAM_CLOSED)" location: "JS frame :: ../../../../_tests/xpcshell-simple/test_zipwriter/unit/test_storedata.js :: run_test :: line 84" data: no]

netwerk/base/src/nsSimpleStreamListener.cpp

@@ -66,10 +66,8 @@ nsSimpleStreamListener::OnStopRequest(nsIRequest* request,
                                       nsISupports *aContext,
                                       nsresult aStatus)
 {
-    if (!mObserver)
-        return mSink->Close();
-
-    return mObserver->OnStopRequest(request, aContext, aStatus);
+    return mObserver ?
+        mObserver->OnStopRequest(request, aContext, aStatus) : NS_OK;
 }
 
 //