Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure everything is still init'd in FinalizeStub

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@168160 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pedemont%us.ibm.com
2005-01-21 22:21:47 +00:00
parent 1f42610a2a
commit 325ff720b9
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/extensions/java/xpcom/nsJavaXPCOMBindingUtils.cpp
View File

@@ -66,6 +66,7 @@ jmethodID getNameMID = nsnull;
#endif
nsJavaXPCOMBindings* gBindings = nsnull;
PRBool gJavaXPCOMInitialized = PR_FALSE;
/**************************************
@@ -344,12 +345,10 @@ nsJavaXPCOMBindings::GetJavaObject(JNIEnv* env, void* aXPCOMObject,
/******************************
* InitializeJavaGlobals
******************************/
PRBool gInitialized = PR_FALSE;
PRBool
InitializeJavaGlobals(JNIEnv *env)
{
if (gInitialized)
if (gJavaXPCOMInitialized)
return PR_TRUE;
jclass clazz;
@@ -438,7 +437,7 @@ InitializeJavaGlobals(JNIEnv *env)
goto init_error;
}
gInitialized = PR_TRUE;
gJavaXPCOMInitialized = PR_TRUE;
return PR_TRUE;
init_error:
@@ -472,7 +471,7 @@ FreeJavaGlobals(JNIEnv* env)
gBindings = nsnull;
}
gInitialized = PR_FALSE;
gJavaXPCOMInitialized = PR_FALSE;
}