Backing out the fix for 154753, which caused a crash at shutdown. sr=sfraser

2002-07-10 04:05:56 +00:00
parent 1391ed1e24
commit ba9f30f1ee
1 changed files with 3 additions and 4 deletions
--- a/xpcom/base/nsExceptionService.cpp
+++ b/xpcom/base/nsExceptionService.cpp
@@ -197,14 +197,13 @@ void nsExceptionService::ThreadDestruct( void *data )

 void nsExceptionService::Shutdown()
 {
+  mProviders.Reset();
  if (lock) {
-    mProviders.Reset();
    DropAllThreads();
-    PR_SetThreadPrivate(tlsIndex, nsnull);
    PR_DestroyLock(lock);
    lock = nsnull;
-  } else
-    PR_SetThreadPrivate(tlsIndex, nsnull);
+  }
+  PR_SetThreadPrivate(tlsIndex, nsnull);
 }

 /* void setCurrentException (in nsIException error); */