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

14
mozilla/extensions/java/xpcom/src/nsJavaXPTCStub.cpp
View File

@@ -537,10 +537,6 @@ nsJavaXPTCStub::CallMethod(PRUint16 aMethodIndex,
// Check for exception from called Java function
jthrowable exp = env->ExceptionOccurred();
if (exp) {
#ifdef DEBUG
env->ExceptionDescribe();
#endif
// If the exception is an instance of XPCOMException, then get the
// nsresult from the exception instance. Else, default to
// NS_ERROR_FAILURE.
@@ -585,8 +581,13 @@ nsJavaXPTCStub::CallMethod(PRUint16 aMethodIndex,
if (java_params)
delete [] java_params;
LOG(("<--- (Java) %s::%s()\n", ifaceName, aMethodInfo->GetName()));
#ifdef DEBUG
if (env->ExceptionCheck())
env->ExceptionDescribe();
#endif
env->ExceptionClear();
LOG(("<--- (Java) %s::%s()\n", ifaceName, aMethodInfo->GetName()));
return rv;
}
@@ -923,7 +924,8 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
jobject java_stub = nsnull;
if (xpcom_obj) {
// Get matching Java object for given xpcom object
rv = GetNewOrUsedJavaObject(env, xpcom_obj, iid, &java_stub);
jobject objLoader = env->CallObjectMethod(mJavaWeakRef, getReferentMID);
rv = GetNewOrUsedJavaObject(env, xpcom_obj, iid, objLoader, &java_stub);
if (NS_FAILED(rv))
break;
}