From dca5e1f9bac83ae931670fe84e489b74b2137550 Mon Sep 17 00:00:00 2001
From: "warren%netscape.com"
 <warren%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 20 Sep 1999 20:54:04 +0000
Subject: [PATCH] fixed circular references in nsNativeComponentLoader

git-svn-id: svn://10.0.0.236/trunk@48371 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpcom/components/nsNativeComponentLoader.cpp | 2 +-
 mozilla/xpcom/components/nsNativeComponentLoader.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mozilla/xpcom/components/nsNativeComponentLoader.cpp b/mozilla/xpcom/components/nsNativeComponentLoader.cpp
index 595505f3f43..41575ecea9b 100644
--- a/mozilla/xpcom/components/nsNativeComponentLoader.cpp
+++ b/mozilla/xpcom/components/nsNativeComponentLoader.cpp
@@ -182,7 +182,7 @@ nsNativeComponentLoader::Init(nsIComponentManager *aCompMgr, nsISupports *aReg)
 
     mCompMgr = aCompMgr;
     mRegistry = do_QueryInterface(aReg);
-    if (!mCompMgr.get() || !mRegistry)
+    if (!mCompMgr || !mRegistry)
         return NS_ERROR_INVALID_ARG;
 
     rv = mRegistry->GetSubtree(nsIRegistry::Common, xpcomKeyName,
diff --git a/mozilla/xpcom/components/nsNativeComponentLoader.h b/mozilla/xpcom/components/nsNativeComponentLoader.h
index 7a6aa9aa5c8..e1a2f905829 100644
--- a/mozilla/xpcom/components/nsNativeComponentLoader.h
+++ b/mozilla/xpcom/components/nsNativeComponentLoader.h
@@ -45,7 +45,7 @@ class nsNativeComponentLoader : public nsIComponentLoader {
 
  protected:
     nsCOMPtr<nsIRegistry> mRegistry;
-    nsCOMPtr<nsIComponentManager> mCompMgr;
+    nsIComponentManager* mCompMgr;      // weak reference -- backpointer
     nsObjectHashtable*  mDllStore;
     NS_IMETHOD RegisterComponentsInDir(PRInt32 when, nsIFileSpec *dir);
     nsIRegistry::Key mXPCOMKey;