diff --git a/mozilla/modules/oji/src/jvmmgr.cpp b/mozilla/modules/oji/src/jvmmgr.cpp index 8991158cd26..3bde27381d8 100644 --- a/mozilla/modules/oji/src/jvmmgr.cpp +++ b/mozilla/modules/oji/src/jvmmgr.cpp @@ -511,7 +511,7 @@ create_java_vm_impl(SystemJavaVM* *jvm, JNIEnv* *initialEnv, void* initargs) const char* classpath = (const char*)initargs; // unused (should it be?) *jvm = (SystemJavaVM*)JVM_GetJVMMgr(); // unused in the browser *initialEnv = JVM_GetJNIEnv(); - return *initialEnv == NULL; + return (*jvm != NULL && *initialEnv != NULL); } static PRBool PR_CALLBACK