From d9e6589574e3c262aff82b1080869ff05325e7a8 Mon Sep 17 00:00:00 2001 From: "beard%netscape.com" Date: Tue, 20 Aug 2002 01:39:30 +0000 Subject: [PATCH] workaround fix for bug #154699, r=sdagley, sr=bryner, a=adt. git-svn-id: svn://10.0.0.236/trunk@127674 18797224-902f-48f8-a5cc-f745e15eee43 --- .../plugin/Source/LiveConnectNativeMethods.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mozilla/plugin/oji/MRJCarbon/plugin/Source/LiveConnectNativeMethods.cpp b/mozilla/plugin/oji/MRJCarbon/plugin/Source/LiveConnectNativeMethods.cpp index 87dda347fd9..3fc967009f8 100644 --- a/mozilla/plugin/oji/MRJCarbon/plugin/Source/LiveConnectNativeMethods.cpp +++ b/mozilla/plugin/oji/MRJCarbon/plugin/Source/LiveConnectNativeMethods.cpp @@ -120,10 +120,19 @@ nsresult InitLiveConnectSupport(MRJPlugin* jvmPlugin) env->DeleteLocalRef(classJSObject); netscape_javascript_JSObject_JSObject = env->GetMethodID(netscape_javascript_JSObject, "", "(I)V"); + if (env->ExceptionCheck()) { + env->ExceptionClear(); + result = NS_ERROR_FAILURE; + } + netscape_javascript_JSObject_internal = env->GetFieldID(netscape_javascript_JSObject, "internal", "I"); + if (env->ExceptionCheck()) { + env->ExceptionClear(); + result = NS_ERROR_FAILURE; + } env->RegisterNatives(netscape_javascript_JSObject, nativeMethods, sizeof(nativeMethods) / sizeof(JNINativeMethod)); - if (env->ExceptionOccurred()) { + if (env->ExceptionCheck()) { env->ExceptionClear(); result = NS_ERROR_FAILURE; }