From b0e85789ed4869c2d64bc825b144ae44de75b0e8 Mon Sep 17 00:00:00 2001
From: Chris Jones <jones.chris.g@gmail.com>
Date: Thu, 4 Mar 2010 13:50:28 -0600
Subject: [PATCH] Bug 549435: Make the leak log available during ipc/-related
 startup and shutdown. r=bsmedberg

---
 xpcom/build/nsXPComInit.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp
index e68a837c3479..65b5a6836a6b 100644
--- a/xpcom/build/nsXPComInit.cpp
+++ b/xpcom/build/nsXPComInit.cpp
@@ -488,6 +488,8 @@ NS_InitXPCOM3(nsIServiceManager* *result,
      // We are not shutting down
     gXPCOMShuttingDown = PR_FALSE;
 
+    NS_LogInit();
+
 #ifdef MOZ_IPC
     // Set up chromium libs
     NS_ASSERTION(!sExitManager && !sMessageLoop, "Bad logic!");
@@ -516,8 +518,6 @@ NS_InitXPCOM3(nsIServiceManager* *result,
     }
 #endif
 
-    NS_LogInit();
-
     // Set up TimeStamp
     rv = TimeStamp::Startup();
     NS_ENSURE_SUCCESS(rv, rv);
@@ -886,8 +886,6 @@ ShutdownXPCOM(nsIServiceManager* servMgr)
 
     TimeStamp::Shutdown();
 
-    NS_LogTerm();
-
 #ifdef MOZ_IPC
     if (sIOThread) {
         delete sIOThread;
@@ -907,6 +905,8 @@ ShutdownXPCOM(nsIServiceManager* servMgr)
     }
 #endif
 
+    NS_LogTerm();
+
     return NS_OK;
 }