From 30bbfdcd43f2e72e82853483847cb70b1544dcb4 Mon Sep 17 00:00:00 2001 From: "darin%netscape.com" Date: Wed, 4 Apr 2001 07:28:51 +0000 Subject: [PATCH] Fixes bug 74118 "can't launch with a new profile" r=bryner, sr=mscott git-svn-id: svn://10.0.0.236/trunk@91268 18797224-902f-48f8-a5cc-f745e15eee43 --- .../netwerk/base/src/nsInputStreamChannel.cpp | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/mozilla/netwerk/base/src/nsInputStreamChannel.cpp b/mozilla/netwerk/base/src/nsInputStreamChannel.cpp index d3b00bdccb9..2584014b1eb 100644 --- a/mozilla/netwerk/base/src/nsInputStreamChannel.cpp +++ b/mozilla/netwerk/base/src/nsInputStreamChannel.cpp @@ -476,25 +476,22 @@ NS_IMETHODIMP nsStreamIOChannel::OnStopRequest(nsIRequest *request, nsISupports* context, nsresult aStatus, const PRUnichar* aStatusArg) { - nsresult rv; + if (mUserObserver) + mUserObserver->OnStopRequest(this, context, aStatus, aStatusArg); - if (mUserObserver) { - rv = mUserObserver->OnStopRequest(this, context, aStatus, aStatusArg); - if (NS_FAILED(rv)) return rv; - } - - if (mLoadGroup) { - if (NS_SUCCEEDED(rv)) { - rv = mLoadGroup->RemoveRequest(this, context, aStatus, aStatusArg); - if (NS_FAILED(rv)) return rv; - } - } + if (mLoadGroup) + mLoadGroup->RemoveRequest(this, context, aStatus, aStatusArg); // Release the reference to the consumer stream listener... - mUserObserver = null_nsCOMPtr(); - mFileTransport = null_nsCOMPtr(); + mRequest = 0; + mFileTransport = 0; + mUserObserver = 0; - return mStreamIO->Close(aStatus); + // Make sure the stream io is closed + mStreamIO->Close(aStatus); + + // There is no point in returning anything other than NS_OK + return NS_OK; } ////////////////////////////////////////////////////////////////////////////////