Don't load the java plugin at startup (bug 128366). Patch originally by peter lubczynski, r=me, sr=shaver.

This commit is contained in:
bryner%brianryner.com 2004-12-01 18:50:44 +00:00
parent 1fffd5e266
commit feb1de1832

View File

@ -890,11 +890,11 @@ nsJVMManager::MaybeStartupLiveConnect(void)
do {
static PRBool registeredLiveConnectFactory = NS_SUCCEEDED(JSJ_RegisterLiveConnectFactory());
if (IsLiveConnectEnabled() && StartupJVM() == nsJVMStatus_Running) {
if (IsLiveConnectEnabled()) {
JVM_InitLCGlue();
#if 0
nsIJVMPlugin* plugin = GetJVMPlugin();
if (plugin) {
#if 0
const char* classpath = NULL;
nsresult err = plugin->GetClassPath(&classpath);
if (err != NS_OK) break;
@ -907,7 +907,7 @@ nsJVMManager::MaybeStartupLiveConnect(void)
if (fJSJavaVM != NULL)
return PR_TRUE;
// plugin->Release(); // GetJVMPlugin no longer calls AddRef
}
//}
}
} while (0);
return PR_FALSE;