Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Bug 444963: Java hangs browser. Release branch landing. r+sr=peterv

  • Loading branch information...
commit 61b8ad1bf486121dfb313020d3adc9134b7c81c5 1 parent 9ab9981
Johnny Stenback authored
Showing with 6 additions and 0 deletions.
  1. +6 −0 modules/plugin/base/src/nsPluginHostImpl.cpp
View
6 modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -3979,6 +3979,12 @@ nsPluginHostImpl::TrySetUpPluginInstance(const char *aMimeType,
PRBool isJavaPlugin = pluginTag->mIsJavaPlugin;
if (isJavaPlugin && !pluginTag->mIsNPRuntimeEnabledJavaPlugin) {
+#if !defined(OJI) && defined(XP_MACOSX)
+ // The MRJ plugin hangs if you try to load it with OJI disabled,
+ // don't even try to go there.
+ return NS_ERROR_FAILURE;
+#endif
+
// We must make sure LiveConnect is started, if needed.
nsCOMPtr<nsIDocument> document;
aOwner->GetDocument(getter_AddRefs(document));
Please sign in to comment.
Something went wrong with that request. Please try again.