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

Rework XPCOMException

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@166965 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pedemont%us.ibm.com
2004-12-22 22:03:50 +00:00
parent 0fc24e7882
commit 6f07d51df2
5 changed files with 112 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/extensions/java/xpcom/nsJavaWrapper.cpp
View File

@@ -883,9 +883,8 @@ CallXPCOMMethod(JNIEnv *env, jclass that, jobject aJavaObject,
{
// Find corresponding XPCOM object
void* xpcomObj = GetMatchingXPCOMObject(env, aJavaObject);
NS_ASSERTION(xpcomObj != nsnull, "Failed to get matching XPCOM object");
if (xpcomObj == nsnull) {
ThrowXPCOMException(env, 0);
ThrowXPCOMException(env, 0, "Failed to get matching XPCOM object");
return;
}
@@ -951,8 +950,7 @@ CallXPCOMMethod(JNIEnv *env, jclass that, jobject aJavaObject,
}
}
if (NS_FAILED(rv)) {
NS_WARNING("SetupParams failed");
ThrowXPCOMException(env, rv);
ThrowXPCOMException(env, rv, "SetupParams failed");
return;
}
}
@@ -975,8 +973,7 @@ CallXPCOMMethod(JNIEnv *env, jclass that, jobject aJavaObject,
}
}
if (NS_FAILED(rv)) {
NS_WARNING("FinalizeParams failed");
ThrowXPCOMException(env, rv);
ThrowXPCOMException(env, rv, "FinalizeParams failed");
return;
}
@@ -1001,7 +998,10 @@ CallXPCOMMethod(JNIEnv *env, jclass that, jobject aJavaObject,
// If the XPCOM method invocation failed, we don't immediately throw an
// exception and return so that we can clean up any parameters.
if (NS_FAILED(invokeResult)) {
ThrowXPCOMException(env, invokeResult);
nsCAutoString message("The function \"");
message.Append(methodInfo->GetName());
message.Append("\" returned an error condition");
ThrowXPCOMException(env, invokeResult, message.get());
}
return;