From 0d36ac255904e01df8759eb0c5a72b3485e98bbd Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Fri, 12 May 2000 04:39:43 +0000 Subject: [PATCH] fix assertion / problem with subscribe. duh. git-svn-id: svn://10.0.0.236/trunk@69361 18797224-902f-48f8-a5cc-f745e15eee43 --- .../mailnews/imap/src/nsImapIncomingServer.cpp | 12 +++++++----- .../mailnews/news/src/nsNntpIncomingServer.cpp | 15 +++++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp index 3791fb03a14..bd9c8709075 100644 --- a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp +++ b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp @@ -1955,9 +1955,9 @@ NS_IMETHODIMP nsImapIncomingServer::StartPopulatingSubscribeDS() { nsresult rv; - mInner = do_CreateInstance(kSubscribableServerCID,&rv); - if (NS_FAILED(rv)) return rv; - if (!mInner) return NS_ERROR_FAILURE; + + NS_ASSERTION(mInner,"not initialized"); + if (!mInner) return NS_ERROR_FAILURE; rv = SetIncomingServer(this); if (NS_FAILED(rv)) return rv; @@ -1971,8 +1971,10 @@ nsImapIncomingServer::StartPopulatingSubscribeDS() NS_IMETHODIMP nsImapIncomingServer::SetSubscribeListener(nsISubscribeListener *aListener) { - NS_ASSERTION(mInner,"not initialized"); - if (!mInner) return NS_ERROR_FAILURE; + nsresult rv; + mInner = do_CreateInstance(kSubscribableServerCID,&rv); + if (NS_FAILED(rv)) return rv; + if (!mInner) return NS_ERROR_FAILURE; return mInner->SetSubscribeListener(aListener); } diff --git a/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp b/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp index a74354a9260..6b92ae22156 100644 --- a/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp +++ b/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp @@ -762,9 +762,9 @@ NS_IMETHODIMP nsNntpIncomingServer::StartPopulatingSubscribeDS() { nsresult rv; - mInner = do_CreateInstance(kSubscribableServerCID,&rv); - if (NS_FAILED(rv)) return rv; - if (!mInner) return NS_ERROR_FAILURE; + + NS_ASSERTION(mInner,"not initialized"); + if (!mInner) return NS_ERROR_FAILURE; rv = SetIncomingServer(this); if (NS_FAILED(rv)) return rv; @@ -777,9 +777,12 @@ nsNntpIncomingServer::StartPopulatingSubscribeDS() NS_IMETHODIMP nsNntpIncomingServer::SetSubscribeListener(nsISubscribeListener *aListener) -{ - NS_ASSERTION(mInner,"not initialized"); - if (!mInner) return NS_ERROR_FAILURE; +{ + nsresult rv; + mInner = do_CreateInstance(kSubscribableServerCID,&rv); + if (NS_FAILED(rv)) return rv; + if (!mInner) return NS_ERROR_FAILURE; + return mInner->SetSubscribeListener(aListener); }