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

Changed references to JSWrappedException to point to JSException instead.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/SpiderMonkey140_BRANCH@12305 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
coop%netscape.com
1998-10-08 20:12:36 +00:00
parent 189fd42355
commit a3f846bbf0
3 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/js/src/liveconnect/jsj.c
View File

@@ -79,7 +79,6 @@ jclass jlDouble; /* java.lang.Double */
jclass jlString; /* java.lang.String */
jclass njJSObject; /* netscape.javascript.JSObject */
jclass njJSException; /* netscape.javascript.JSException */
jclass njJSWrappedException; /* netscape.javascript.JSWrappedException */
jclass njJSUtil; /* netscape.javascript.JSUtil */
jmethodID jlClass_getMethods; /* java.lang.Class.getMethods() */
@@ -115,7 +114,6 @@ jmethodID jlSystem_identityHashCode; /* java.lang.System.identityHashCode() *
jobject jlVoid_TYPE; /* java.lang.Void.TYPE value */
jmethodID njJSException_JSException; /* netscape.javascript.JSException constructor */
jmethodID njJSWrappedException_JSWrappedException; /* netscape.javascript.JSWrappedException constructor */
jmethodID njJSObject_JSObject; /* netscape.javascript.JSObject constructor */
jmethodID njJSUtil_getStackTrace; /* netscape.javascript.JSUtil.getStackTrace() */
jfieldID njJSObject_internal; /* netscape.javascript.JSObject.internal */
@@ -123,7 +121,7 @@ jfieldID njJSException_lineno; /* netscape.javascript.JSException.linen
jfieldID njJSException_tokenIndex; /* netscape.javascript.JSException.tokenIndex */
jfieldID njJSException_source; /* netscape.javascript.JSException.source */
jfieldID njJSException_filename; /* netscape.javascript.JSException.filename */
jfieldID njJSWrappedException_exception; /* netscape.javascript.JSWrappedException.exception */
jfieldID njJSException_wrappedException; /* netscape.javascript.JSException.wrappedException */
/* Obtain a reference to a Java class */
#define LOAD_CLASS(qualified_name, class) \
@@ -321,7 +319,6 @@ init_netscape_java_classes(JSJavaVM *jsjava_vm, JNIEnv *jEnv)
{
LOAD_CLASS(netscape/javascript/JSObject, njJSObject);
LOAD_CLASS(netscape/javascript/JSException, njJSException);
LOAD_CLASS(netscape/javascript/JSWrappedException, njJSWrappedException);
LOAD_CLASS(netscape/javascript/JSUtil, njJSUtil);
#if XP_MAC
@@ -333,8 +330,8 @@ init_netscape_java_classes(JSJavaVM *jsjava_vm, JNIEnv *jEnv)
LOAD_CONSTRUCTOR(netscape.javascript.JSException, JSException,
"(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;I)V",
njJSException);
LOAD_CONSTRUCTOR(netscape.javascript.JSWrappedException,
JSWrappedException, "(Ljava/lang/Object)V", njJSWrappedException);
LOAD_CONSTRUCTOR(netscape.javascript.JSException, JSException,
"(Ljava/lang/Object;)V", njJSException);
LOAD_FIELDID(netscape.javascript.JSObject, internal, "I", njJSObject);
LOAD_FIELDID(netscape.javascript.JSException, lineno, "I", njJSException);
LOAD_FIELDID(netscape.javascript.JSException, tokenIndex, "I",
@@ -343,8 +340,8 @@ init_netscape_java_classes(JSJavaVM *jsjava_vm, JNIEnv *jEnv)
"Ljava/lang/String;", njJSException);
LOAD_FIELDID(netscape.javascript.JSException, filename,
"Ljava/lang/String;", njJSException);
LOAD_FIELDID(netscape.javascript.JSWrappedException, exception,
"Ljava/lang/Object;", njJSWrappedException);
LOAD_FIELDID(netscape.javascript.JSException, wrappedException,
"Ljava/lang/Object;", njJSException);
LOAD_STATIC_METHOD(netscape.javascript.JSUtil, getStackTrace,
"(Ljava/lang/Throwable;)Ljava/lang/String;", njJSUtil);
@@ -517,7 +514,6 @@ JSJ_DisconnectFromJavaVM(JSJavaVM *jsjava_vm)
UNLOAD_CLASS(java/lang/Void, jlVoid);
UNLOAD_CLASS(netscape/javascript/JSObject, njJSObject);
UNLOAD_CLASS(netscape/javascript/JSException, njJSException);
UNLOAD_CLASS(netscape/javascript/JSWrappedException, njJSWrappedException);
UNLOAD_CLASS(netscape/javascript/JSUtil, njJSUtil);
}

19
mozilla/js/src/liveconnect/jsj_JSObject.c
View File

@@ -404,29 +404,30 @@ throw_any_pending_js_error_as_a_java_exception(JSJavaThreadState *jsj_env)
/* Get the Java JNI environment */
jEnv = jsj_env->jEnv;
/* Get the pending JS exception if it exists */
if (JS_IsExceptionPending(jsj_env->cx)) {
if (!JS_GetPendingException(jsj_env->cx, &pending_exception))
return;
/* Convert jsval exception to a java object and then use it to
create an instance of JSWrappedException. */
if (!jsj_ConvertJSValueToJavaObject(jsj_env->cx, jEnv, pending_exception,
create an instance of JSException. */
if (!jsj_ConvertJSValueToJavaObject(jsj_env->cx, jEnv,
pending_exception,
jsj_get_jlObject_descriptor(jsj_env->cx, jEnv),
&dummy_cost, &java_obj, &dummy_bool))
&dummy_cost, &java_obj,
&dummy_bool))
goto done;
java_exception =
(*jEnv)->NewObject(jEnv, njJSWrappedException,
njJSWrappedException_JSWrappedException,
(jobject)java_obj);
java_exception = (*jEnv)->NewObject(jEnv, njJSException,
njJSException_JSException,
java_obj);
if (!java_exception)
goto out_of_memory;
/* Throw the newly-created JSException */
if ((*jEnv)->Throw(jEnv, java_exception) < 0) {
JS_ASSERT(0);
jsj_LogError("Couldn't throw JSWrappedException\n");
jsj_LogError("Couldn't throw JSException\n");
goto done;
}
JS_ClearPendingException(jsj_env->cx);

4
mozilla/js/src/liveconnect/jsj_private.h
View File

@@ -205,7 +205,6 @@ extern jclass jlDouble; /* java.lang.Double */
extern jclass jlString; /* java.lang.String */
extern jclass njJSObject; /* netscape.javascript.JSObject */
extern jclass njJSException; /* netscape.javascript.JSException */
extern jclass njJSWrappedException; /* netscape.javascript.JSWrappedException */
extern jclass njJSUtil; /* netscape.javascript.JSUtil */
extern jmethodID jlClass_getMethods; /* java.lang.Class.getMethods() */
@@ -241,7 +240,6 @@ extern jmethodID jlSystem_identityHashCode; /* java.lang.System.identityHashC
extern jobject jlVoid_TYPE; /* java.lang.Void.TYPE value */
extern jmethodID njJSException_JSException; /* netscape.javascipt.JSException constructor */
extern jmethodID njJSWrappedException_JSWrappedException; /* netscape.javascipt.JSWrappedException constructor */
extern jmethodID njJSObject_JSObject; /* netscape.javascript.JSObject constructor */
extern jmethodID njJSUtil_getStackTrace; /* netscape.javascript.JSUtil.getStackTrace() */
extern jfieldID njJSObject_internal; /* netscape.javascript.JSObject.internal */
@@ -249,7 +247,7 @@ extern jfieldID njJSException_lineno; /* netscape.javascript.JSExceptio
extern jfieldID njJSException_tokenIndex; /* netscape.javascript.JSException.tokenIndex */
extern jfieldID njJSException_source; /* netscape.javascript.JSException.source */
extern jfieldID njJSException_filename; /* netscape.javascript.JSException.filename */
extern jfieldID njJSWrappedException_exception; /* netscape.javascript.JSWrappedException.exception */
extern jfieldID njJSException_wrappedException; /* netscape.javascript.JSException.wrappedException */
/**************** Java <==> JS conversions and Java types *******************/
extern JSBool