Bug 398313 - "Java plugin doesn't show up in disabled state (Add-ons Manager)" [p=Mossop r+sr=jst a=blocking1.9+]

modules/plugin/base/src/nsPluginDirServiceProvider.cpp

@@ -278,12 +278,9 @@ nsPluginDirServiceProvider::GetFile(const char *prop, PRBool *persistant,
       }
     }
   } else if (nsCRT::strcmp(prop, NS_WIN_JRE_SCAN_KEY) == 0) {
-    PRBool isJavaEnabled;
     nsXPIDLCString strVer;
 #ifdef OJI
-    if ((NS_FAILED(prefs->GetBoolPref("security.enable_java", &isJavaEnabled))
+    if (NS_FAILED(prefs->GetCharPref(prop, getter_Copies(strVer))))
-         || !isJavaEnabled) ||
-        NS_FAILED(prefs->GetCharPref(prop, getter_Copies(strVer))))
 #endif /* OJI */
       return NS_ERROR_FAILURE;
     verBlock minVer;