From 448479d2a7c6cdcda4a3ad5fae7765e0fa3f6358 Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net" <bsmedberg%covad.net>
Date: Fri, 2 Dec 2005 20:27:52 +0000
Subject: [PATCH] Go back to not-unloading component DLLs because of balsa
 orange :-(

---
 xpcom/components/nsNativeComponentLoader.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/xpcom/components/nsNativeComponentLoader.cpp b/xpcom/components/nsNativeComponentLoader.cpp
index 9feb9353f4ea..2ccf2326e568 100644
--- a/xpcom/components/nsNativeComponentLoader.cpp
+++ b/xpcom/components/nsNativeComponentLoader.cpp
@@ -215,10 +215,6 @@ PLDHashOperator
 nsNativeModuleLoader::UnloaderFunc(nsIHashable* aHashedFile,
                                    NativeLoadData& aLoadData, void*)
 {
-#ifdef NS_BUILD_REFCNT_LOGGING
-    nsTraceRefcntImpl::SetActivityIsLegal(PR_FALSE);
-#endif
-
     if (PR_LOG_TEST(nsNativeModuleLoaderLog, PR_LOG_DEBUG)) {
         nsCOMPtr<nsIFile> file(do_QueryInterface(aHashedFile));
 
@@ -229,8 +225,16 @@ nsNativeModuleLoader::UnloaderFunc(nsIHashable* aHashedFile,
             ("nsNativeModuleLoader::UnloaderFunc(\"%s\")", filePath.get()));
     }
 
+#ifdef NS_BUILD_REFCNT_LOGGING
+    nsTraceRefcntImpl::SetActivityIsLegal(PR_FALSE);
+#endif
+
+#if 0
+    // XXXbsmedberg: do this as soon as the static-destructor crash(es)
+    // are fixed
     PRStatus ret = PR_UnloadLibrary(aLoadData.library);
     NS_ASSERTION(ret == PR_SUCCESS, "Failed to unload library");
+#endif
 
 #ifdef NS_BUILD_REFCNT_LOGGING
     nsTraceRefcntImpl::SetActivityIsLegal(PR_TRUE);