diff options
| author | asaha <none@none> | 2014-07-14 11:15:04 -0700 |
|---|---|---|
| committer | asaha <none@none> | 2014-07-14 11:15:04 -0700 |
| commit | d7b2f376c60ab0419b21549fed457a47a0a41c67 (patch) | |
| tree | 84bbedef3f65fc8a074e09b40618c79915737e0e /src/share/classes/javax | |
| parent | a28dc8994993d2b3f6a4122c8839360619a5a114 (diff) | |
| parent | 88ab103c4b6e4bf19f4804e8fd12eaba6bbb9cf6 (diff) | |
Mergejdk8u25-b07
Diffstat (limited to 'src/share/classes/javax')
| -rw-r--r-- | src/share/classes/javax/swing/PopupFactory.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/share/classes/javax/swing/PopupFactory.java b/src/share/classes/javax/swing/PopupFactory.java index 99d0359d3..4e140c8b0 100644 --- a/src/share/classes/javax/swing/PopupFactory.java +++ b/src/share/classes/javax/swing/PopupFactory.java @@ -232,7 +232,8 @@ public class PopupFactory { case HEAVY_WEIGHT_POPUP: Popup popup = getHeavyWeightPopup(owner, contents, ownerX, ownerY); if ((AccessController.doPrivileged(OSInfo.getOSTypeAction()) == - OSInfo.OSType.MACOSX) && (EmbeddedFrame.getAppletIfAncestorOf(owner) != null)) { + OSInfo.OSType.MACOSX) && (owner != null) && + (EmbeddedFrame.getAppletIfAncestorOf(owner) != null)) { ((HeavyWeightPopup)popup).setCacheEnabled(false); } return popup; |