Bug 5637. Don't release each observer in the destructor, because we only hold a weak ref to it. r=putterman,a=chofmann.

mailnews/base/src/nsMessageViewDataSource.cpp

@@ -93,13 +93,9 @@ nsMessageViewDataSource::~nsMessageViewDataSource (void)
 	RemoveDataSource(mDataSource);
 	if(mURI)
 		PL_strfree(mURI);
-	if (mObservers) {
+
-	  for (PRInt32 i = mObservers->Count() - 1; i >= 0; --i) {
+  delete mObservers; // we only hold a weak ref to each observer
-		  nsIRDFObserver* obs = (nsIRDFObserver*) mObservers->ElementAt(i);
+
-		  NS_RELEASE(obs);
-	  }
-	  delete mObservers;
-	}
 	nsrefcnt refcnt;
 	NS_RELEASE2(kNC_MessageChild, refcnt);
 	NS_RELEASE2(kNC_Subject, refcnt);

mailnews/base/src/nsMsgFolderDataSource.cpp

@@ -76,13 +76,9 @@ nsMsgFolderDataSource::~nsMsgFolderDataSource (void)
   mRDFService->UnregisterDataSource(this);
 
   PL_strfree(mURI);
-  if (mObservers) {
+
-      for (PRInt32 i = mObservers->Count() - 1; i >= 0; --i) {
+  delete mObservers; // we only hold a weak ref to each observer
-          nsIRDFObserver* obs = (nsIRDFObserver*) mObservers->ElementAt(i);
+
-          NS_RELEASE(obs);
-      }
-      delete mObservers;
-  }
   nsrefcnt refcnt;
   NS_RELEASE2(kNC_Child, refcnt);
   NS_RELEASE2(kNC_MessageChild, refcnt);

mailnews/base/src/nsMsgMessageDataSource.cpp

@@ -72,13 +72,9 @@ nsMsgMessageDataSource::~nsMsgMessageDataSource (void)
   mRDFService->UnregisterDataSource(this);
 
   PL_strfree(mURI);
-  if (mObservers) {
+
-      for (PRInt32 i = mObservers->Count() - 1; i >= 0; --i) {
+  delete mObservers; // we only hold a weak ref to each observer
-          nsIRDFObserver* obs = (nsIRDFObserver*) mObservers->ElementAt(i);
+
-          NS_RELEASE(obs);
-      }
-      delete mObservers;
-  }
   nsrefcnt refcnt;
 
   NS_RELEASE2(kNC_Subject, refcnt);