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

Bug 353693 - nsJavaXPTCStub should use Java class' loader for loading Mozilla classes. r=apeller. XULRunner only.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@212810 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pedemont%us.ibm.com
2006-09-28 18:29:17 +00:00
parent ca4274f7fa
commit 4b066f6ce7
7 changed files with 97 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/extensions/java/xpcom/src/nsJavaInterfaces.cpp
View File

@@ -138,7 +138,7 @@ InitXPCOM_Impl(JNIEnv* env, jobject aMozBinDirectory,
// create Java proxy for service manager returned by NS_InitXPCOM2
return GetNewOrUsedJavaObject(env, servMan, NS_GET_IID(nsIServiceManager),
aResult);
nsnull, aResult);
}
extern "C" NS_EXPORT jobject
@@ -202,7 +202,7 @@ XPCOM_NATIVE(newLocalFile) (JNIEnv *env, jobject, jstring aPath,
if (NS_SUCCEEDED(rv)) {
jobject javaProxy;
rv = GetNewOrUsedJavaObject(env, file, NS_GET_IID(nsILocalFile),
&javaProxy);
nsnull, &javaProxy);
if (NS_SUCCEEDED(rv))
return javaProxy;
}
@@ -221,7 +221,7 @@ XPCOM_NATIVE(getComponentManager) (JNIEnv *env, jobject)
if (NS_SUCCEEDED(rv)) {
jobject javaProxy;
rv = GetNewOrUsedJavaObject(env, cm, NS_GET_IID(nsIComponentManager),
&javaProxy);
nsnull, &javaProxy);
if (NS_SUCCEEDED(rv))
return javaProxy;
}
@@ -240,7 +240,7 @@ XPCOM_NATIVE(getComponentRegistrar) (JNIEnv *env, jobject)
if (NS_SUCCEEDED(rv)) {
jobject javaProxy;
rv = GetNewOrUsedJavaObject(env, cr, NS_GET_IID(nsIComponentRegistrar),
&javaProxy);
nsnull, &javaProxy);
if (NS_SUCCEEDED(rv))
return javaProxy;
}
@@ -259,7 +259,7 @@ XPCOM_NATIVE(getServiceManager) (JNIEnv *env, jobject)
if (NS_SUCCEEDED(rv)) {
jobject javaProxy;
rv = GetNewOrUsedJavaObject(env, sm, NS_GET_IID(nsIServiceManager),
&javaProxy);
nsnull, &javaProxy);
if (NS_SUCCEEDED(rv))
return javaProxy;
}
@@ -286,7 +286,7 @@ LockProfileDirectory_Impl(JNIEnv* env, jobject aDirectory,
NS_ENSURE_SUCCESS(rv, rv);
rv = GetNewOrUsedJavaObject(env, lockObj, NS_GET_IID(nsISupports),
aJavaLock);
nsnull, aJavaLock);
NS_IF_RELEASE(lockObj);
return rv;
}