Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-25 11:58:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

My bad: orphaned code fix for bug 5369. The rest of this bug fix was

Browse Source 
checked in some time ago, but this portion of the fix never made it
it.  r=drapeau@eng.sun.com.  Log error when LiveConnect cannot be
started due to an error in the Java VM.
This commit is contained in:
drapeau%eng.sun.com 1999-12-01 01:43:16 +00:00
parent f8899d4936
commit 5572b27499
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/liveconnect/jsj.c
View File

@ -465,7 +465,7 @@ JSJ_ConnectToJavaVM(SystemJavaVM *java_vm_arg, void* initargs)
jsjava_vm->java_vm = java_vm;
jsjava_vm->main_thread_env = jEnv;
/*
* JVM initialization for netscape.javascript.JSObject is performed
* independently of the other classes that are initialized in
@ -479,6 +479,10 @@ JSJ_ConnectToJavaVM(SystemJavaVM *java_vm_arg, void* initargs)
Java reflection. */
if (!init_java_VM_reflection(jsjava_vm, jEnv) ||
!jsj_InitJavaObjReflectionsTable()) {
jsj_LogError("LiveConnect was unable to reflect one or more components of the Java runtime.\nGo to http://bugzilla.mozilla.org/show_bug.cgi?id=5369 for details.\n");
// This function crashes when called from here.
// Check that all the preconditions for this
// call are satisfied before making it. [jd]
JSJ_DisconnectFromJavaVM(jsjava_vm);
return NULL;
}
@ -596,7 +600,7 @@ JSJ_DisconnectFromJavaVM(JSJavaVM *jsjava_vm)
break;
}
}
JS_ASSERT(j);
JS_ASSERT(j); // vm not found in list
#ifdef JSJ_THREADSAFE
if (jsjava_vm_list == NULL) {