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

Create special xpcom exception class. Also, throw exception when we DON'T already have an exception. Not part of default build.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@163125 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pedemont%us.ibm.com
2004-10-01 23:05:41 +00:00
parent b183f0786f
commit aa7312e84f
3 changed files with 70 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/extensions/java/xpcom/nsJavaXPCOMBindingUtils.cpp
View File

@@ -100,7 +100,7 @@ jclass stringArrayClass = nsnull;
jclass nsISupportsClass = nsnull;
jclass exceptionClass = nsnull;
jclass xpcomExceptionClass = nsnull;
/**************************************
* Java<->XPCOM binding stores
@@ -342,8 +342,8 @@ InitializeJavaGlobals(JNIEnv *env)
return PR_FALSE;
}
if (!(clazz = env->FindClass("java/lang/Exception")) ||
!(exceptionClass = (jclass) env->NewGlobalRef(clazz)))
if (!(clazz = env->FindClass("org/mozilla/xpcom/XPCOMException")) ||
!(xpcomExceptionClass = (jclass) env->NewGlobalRef(clazz)))
{
return PR_FALSE;
}
@@ -518,12 +518,14 @@ CreateJavaXPCOMInstance(nsISupports* aXPCOMObject, const nsIID* aIID)
void
ThrowXPCOMException(JNIEnv* env, int aFailureCode)
{
// only throw this exception if one hasn't already been thrown
// Only throw this exception if one hasn't already been thrown, so we don't
// mask a previous exception/error.
jthrowable throwObj = env->ExceptionOccurred();
if (throwObj != nsnull) {
char exp_msg[32];
sprintf(exp_msg, "\nInternal Gecko Error: %x", aFailureCode);
env->ThrowNew(exceptionClass, exp_msg);
if (throwObj == nsnull) {
char exp_msg[40];
sprintf(exp_msg, "\nInternal XPCOM Error: %x", aFailureCode);
jint rc = env->ThrowNew(xpcomExceptionClass, exp_msg);
NS_ASSERTION(rc == 0, "Failed to throw XPCOMException");
}
}