From ae2660d43316cd9edc388aa8faff1477c4374b94 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu"
 <bzbarsky%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 24 Oct 2004 17:24:25 +0000
Subject: [PATCH] nsCOMArray::RemoveObjectAt fails to remove nulls correctly. 
 Bug 265772, r=darin, sr=dbaron

git-svn-id: svn://10.0.0.236/trunk@164279 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpcom/ds/nsCOMArray.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/mozilla/xpcom/ds/nsCOMArray.cpp b/mozilla/xpcom/ds/nsCOMArray.cpp
index 9a2702232ec..37c3af874ed 100644
--- a/mozilla/xpcom/ds/nsCOMArray.cpp
+++ b/mozilla/xpcom/ds/nsCOMArray.cpp
@@ -135,13 +135,10 @@ PRBool
 nsCOMArray_base::RemoveObjectAt(PRInt32 aIndex)
 {
     nsISupports* element = ObjectAt(aIndex);
-    if (element) {
-        PRBool result = mArray.RemoveElementAt(aIndex);
-        if (result)
-            NS_IF_RELEASE(element);
-        return result;
-    }
-    return PR_FALSE;
+    PRBool result = mArray.RemoveElementAt(aIndex);
+    if (result)
+        NS_IF_RELEASE(element);
+    return result;
 }
 
 // useful for destructors