From 744bfc7a0c7cfbf802151a5c76523bfc932a66d2 Mon Sep 17 00:00:00 2001
From: "dbaron%dbaron.org" <dbaron%dbaron.org>
Date: Tue, 3 Jul 2007 21:21:57 +0000
Subject: [PATCH] Make suspectCurrent assertion not fire constantly after we
 Fault.  b=386664  r+sr=peterv

---
 xpcom/base/nsCycleCollector.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp
index 3a39ccb2051..d3e44599101 100644
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -2390,7 +2390,8 @@ nsCycleCollector_suspectCurrent(nsISupports *n)
 {
     if (sCollector) {
         PRBool res = sCollector->Suspect(n, PR_TRUE);
-        NS_ASSERTION(res, "suspectCurrent should not fail");
+        NS_ASSERTION(res || sCollector->mParams.mDoNothing,
+                     "suspectCurrent should not fail");
     }
 }