modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java

rev 9452 : 8144680: Stage.alwaysOnTop() doesn't work if a security manager is set
Reviewed-by:

@@ -24,11 +24,10 @@
  */
 
 package com.sun.javafx.tk.quantum;
 
 import java.nio.ByteBuffer;
-import java.security.AccessControlException;
 import java.security.AccessController;
 import java.security.AllPermission;
 import java.security.Permission;
 import java.security.PrivilegedAction;
 import java.security.AccessControlContext;

@@ -585,15 +584,16 @@
         return isPrimaryStage && null != appletWindow;
     }
 
     private boolean hasPermission(Permission perm) {
         try {
-            if (System.getSecurityManager() != null) {
-                getAccessControlContext().checkPermission(perm);
+            final SecurityManager sm = System.getSecurityManager();
+            if (sm != null) {
+                sm.checkPermission(perm, getAccessControlContext());
             }
             return true;
-        } catch (AccessControlException ae) {
+        } catch (SecurityException se) {
             return false;
         }
     }
 
     // We may need finer-grained permissions in the future, but for