Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 61b8ad1bf486121dfb313020d3adc9134b7c81c5 1 parent 9ab9981
Johnny Stenback authored

Showing 1 changed file with 6 additions and 0 deletions. Show diff stats Hide diff stats

  1. +6 0 modules/plugin/base/src/nsPluginHostImpl.cpp
6 modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -3979,6 +3979,12 @@ nsPluginHostImpl::TrySetUpPluginInstance(const char *aMimeType,
3979 3979 PRBool isJavaPlugin = pluginTag->mIsJavaPlugin;
3980 3980
3981 3981 if (isJavaPlugin && !pluginTag->mIsNPRuntimeEnabledJavaPlugin) {
  3982 +#if !defined(OJI) && defined(XP_MACOSX)
  3983 + // The MRJ plugin hangs if you try to load it with OJI disabled,
  3984 + // don't even try to go there.
  3985 + return NS_ERROR_FAILURE;
  3986 +#endif
  3987 +
3982 3988 // We must make sure LiveConnect is started, if needed.
3983 3989 nsCOMPtr<nsIDocument> document;
3984 3990 aOwner->GetDocument(getter_AddRefs(document));

0 comments on commit 61b8ad1

Please sign in to comment.
Something went wrong with that request. Please try again.