corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 462497. Don't reacquire a monitor in nsComponentManagerImpl::HashContractID that we already hold. r=bsmedberg

Browse Source
This commit is contained in:
Sergey Yanovich
2009-01-08 21:41:55 +13:00
parent 804dac6c5d
commit 1eb9f303d0
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xpcom/components/nsComponentManager.cpp
View File

@@ -84,6 +84,7 @@
#include "xptinfo.h" // this after nsISupports, to pick up IID so that xpt stuff doesn't try to define it itself...
#include "nsThreadUtils.h"
#include "prthread.h"
#include "private/pprthred.h"
#include "nsInt64.h"
#include "nsManifestLineReader.h"
@@ -1298,7 +1299,7 @@ nsComponentManagerImpl::HashContractID(const char *aContractID,
if(!aContractID || !aContractIDLen)
return NS_ERROR_NULL_POINTER;
nsAutoMonitor mon(mMon);
NS_ABORT_IF_FALSE(PR_InMonitor(mMon), "called from outside mMon");
nsContractIDTableEntry* contractIDTableEntry =
static_cast<nsContractIDTableEntry*>