diff options
| author | dmarkov <none@none> | 2014-07-01 14:19:15 +0400 |
|---|---|---|
| committer | dmarkov <none@none> | 2014-07-01 14:19:15 +0400 |
| commit | ad23b858b3dbfbb937fe0169d63de7fd8953f902 (patch) | |
| tree | 23de4549f8aec415dde7e305ac53665eb697f19b /src/share/classes/javax | |
| parent | 4577aedc555671487b2a83e927702b14b616271a (diff) | |
8048506: [macosx] javax.swing.PopupFactory issue with null owner
Reviewed-by: pchelko, alexsch
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; |