Don't load the java plugin at startup (bug 128366). Patch originally by peter lubczynski, r=me, sr=shaver.
git-svn-id: svn://10.0.0.236/trunk@166080 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user