From bbdd8e0b52618cf00d27ae6f9ff10de90c44e261 Mon Sep 17 00:00:00 2001
From: "timeless%mac.com"
 <timeless%mac.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 10 Jul 2002 00:51:25 +0000
Subject: [PATCH] Bug 154753 nsExceptionService ignoring thread destruction
 after shutdown r=dougt sr=smfr

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

diff --git a/mozilla/xpcom/base/nsExceptionService.cpp b/mozilla/xpcom/base/nsExceptionService.cpp
index c788644ca27..a94c919fb9a 100644
--- a/mozilla/xpcom/base/nsExceptionService.cpp
+++ b/mozilla/xpcom/base/nsExceptionService.cpp
@@ -197,13 +197,14 @@ void nsExceptionService::ThreadDestruct( void *data )
 
 void nsExceptionService::Shutdown()
 {
-  mProviders.Reset();
   if (lock) {
+    mProviders.Reset();
     DropAllThreads();
+    PR_SetThreadPrivate(tlsIndex, nsnull);
     PR_DestroyLock(lock);
     lock = nsnull;
-  }
-  PR_SetThreadPrivate(tlsIndex, nsnull);
+  } else
+    PR_SetThreadPrivate(tlsIndex, nsnull);
 }
 
 /* void setCurrentException (in nsIException error); */