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

8
mozilla/extensions/java/xpcom/src/nsJavaWrapper.cpp
View File

@@ -1115,7 +1115,7 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType,
jobject java_obj = nsnull;
if (xpcom_obj) {
// Get matching Java object for given xpcom object
rv = GetNewOrUsedJavaObject(env, xpcom_obj, aIID, &java_obj);
rv = GetNewOrUsedJavaObject(env, xpcom_obj, aIID, nsnull, &java_obj);
if (NS_FAILED(rv))
break;
}
@@ -1606,7 +1606,7 @@ JAVAPROXY_NATIVE(callXPCOMMethod) (JNIEnv *env, jclass that, jobject aJavaProxy,
nsresult
CreateJavaProxy(JNIEnv* env, nsISupports* aXPCOMObject, const nsIID& aIID,
jobject* aResult)
jobject aObjectLoader, jobject* aResult)
{
NS_PRECONDITION(aResult != nsnull, "null ptr");
if (!aResult)
@@ -1637,9 +1637,9 @@ CreateJavaProxy(JNIEnv* env, nsISupports* aXPCOMObject, const nsIID& aIID,
jobject java_obj = nsnull;
// Create proper Java interface name
nsCAutoString class_name("org/mozilla/xpcom/");
nsCAutoString class_name("org.mozilla.xpcom.");
class_name.AppendASCII(iface_name);
jclass ifaceClass = env->FindClass(class_name.get());
jclass ifaceClass = FindClassInLoader(env, aObjectLoader, class_name.get());
if (ifaceClass) {
java_obj = env->CallStaticObjectMethod(xpcomJavaProxyClass,