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

Bug 305815 - Better organize Java interfaces. Implement getGREPathWithProperties(). r=bsmedberg, r=lbustelo. Not part of default build.

Browse Source 
Original committer: pedemont%us.ibm.com
Original revision: 1.35
Original date: 2005/10/28 01:59:03


git-svn-id: svn://10.0.0.236/trunk@212696 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pedemont%us.ibm.com
2006-09-27 15:19:00 +00:00
parent 1176e60a46
commit b57b3d5299
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp
View File

@@ -224,7 +224,7 @@ InitializeJavaGlobals(JNIEnv *env)
goto init_error;
}
if (!(clazz = env->FindClass("org/mozilla/xpcom/XPCOMJavaProxy")) ||
if (!(clazz = env->FindClass("org/mozilla/xpcom/internal/XPCOMJavaProxy")) ||
!(xpcomJavaProxyClass = (jclass) env->NewGlobalRef(clazz)) ||
!(createProxyMID = env->GetStaticMethodID(clazz, "createProxy",
"(Ljava/lang/Class;J)Ljava/lang/Object;")) ||
@@ -234,7 +234,7 @@ InitializeJavaGlobals(JNIEnv *env)
"getNativeXPCOMInstance",
"(Ljava/lang/Object;)J")))
{
NS_WARNING("Problem creating org.mozilla.xpcom.XPCOMJavaProxy globals");
NS_WARNING("Problem creating org.mozilla.xpcom.internal.XPCOMJavaProxy globals");
goto init_error;
}
@@ -283,11 +283,14 @@ init_error:
void
FreeJavaGlobals(JNIEnv* env)
{
PR_Lock(gJavaXPCOMLock);
PRLock* tempLock = nsnull;
if (gJavaXPCOMLock) {
PR_Lock(gJavaXPCOMLock);
// null out global lock so no one else can use it
PRLock* tempLock = gJavaXPCOMLock;
gJavaXPCOMLock = nsnull;
// null out global lock so no one else can use it
tempLock = gJavaXPCOMLock;
gJavaXPCOMLock = nsnull;
}
gJavaXPCOMInitialized = PR_FALSE;
@@ -354,8 +357,10 @@ FreeJavaGlobals(JNIEnv* env)
xpcomJavaProxyClass = nsnull;
}
PR_Unlock(tempLock);
PR_DestroyLock(tempLock);
if (tempLock) {
PR_Unlock(tempLock);
PR_DestroyLock(tempLock);
}
}