95501 r/sr=bienvenu sr=mscott. Fix nsDocShell leaks for pop3 accts on start-up and shutdown.
git-svn-id: svn://10.0.0.236/trunk@102460 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
c25a7edcbb
commit
e6a794f445
@ -198,11 +198,11 @@ nsresult nsMsgProtocol::SetupTransportState()
|
||||
nsresult nsMsgProtocol::CloseSocket()
|
||||
{
|
||||
nsresult rv = NS_OK;
|
||||
|
||||
// release all of our socket state
|
||||
m_socketIsOpen = PR_FALSE;
|
||||
m_outputStream = null_nsCOMPtr();
|
||||
|
||||
if (m_transport)
|
||||
m_transport->SetNotificationCallbacks(nsnull, PR_FALSE);
|
||||
// we need to call Cancel so that we remove the socket transport from the mActiveTransportList. see bug #30648
|
||||
if (m_request) {
|
||||
rv = m_request->Cancel(NS_BINDING_ABORTED);
|
||||
@ -280,7 +280,7 @@ NS_IMETHODIMP nsMsgProtocol::OnStopRequest(nsIRequest *request, nsISupports *ctx
|
||||
// happens to be using
|
||||
if (!mSuppressListenerNotifications && m_channelListener)
|
||||
rv = m_channelListener->OnStopRequest(this, m_channelContext, aStatus);
|
||||
|
||||
|
||||
nsCOMPtr <nsIMsgMailNewsUrl> msgUrl = do_QueryInterface(ctxt, &rv);
|
||||
if (NS_SUCCEEDED(rv) && msgUrl)
|
||||
{
|
||||
|
||||
@ -435,7 +435,9 @@ nsProxyEventObject::~nsProxyEventObject()
|
||||
nsCOMPtr<nsISupports> rootQueue = do_QueryInterface(mProxyObject->mDestQueue);
|
||||
nsProxyEventKey key(rootObject, rootQueue, mProxyObject->mProxyType);
|
||||
void* value = realToProxyMap->Remove(&key);
|
||||
#ifdef DEBUG_dougt
|
||||
NS_ASSERTION(value, "failed to remove from realToProxyMap");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user