#19 remove doPrivileged block from setting policy in JSM implementations

pro-grade · Sep 4, 2014 · 90dbcf8 · 90dbcf8
1 parent ab1ec8a
commit 90dbcf8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 53 deletions.
diff --git a/src/main/java/net/sourceforge/prograde/sm/DumpMissingPermissionsJSM.java b/src/main/java/net/sourceforge/prograde/sm/DumpMissingPermissionsJSM.java
@@ -19,6 +19,8 @@
  */
 package net.sourceforge.prograde.sm;
 
+import java.security.Policy;
+
 import net.sourceforge.prograde.generator.NotifyAndAllowPolicy;
 import net.sourceforge.prograde.generator.PrintDeniedPermissions;
 
@@ -34,6 +36,6 @@ public class DumpMissingPermissionsJSM extends SecurityManager {
      * JSM Constructor.
      */
     public DumpMissingPermissionsJSM() {
-        SecurityActions.setPolicy(new NotifyAndAllowPolicy(null, new PrintDeniedPermissions()));
+        Policy.setPolicy(new NotifyAndAllowPolicy(null, new PrintDeniedPermissions()));
     }
 }
diff --git a/src/main/java/net/sourceforge/prograde/sm/PolicyFileGeneratorJSM.java b/src/main/java/net/sourceforge/prograde/sm/PolicyFileGeneratorJSM.java
@@ -19,6 +19,8 @@
  */
 package net.sourceforge.prograde.sm;
 
+import java.security.Policy;
+
 import net.sourceforge.prograde.generator.GeneratePolicyFromDeniedPermissions;
 import net.sourceforge.prograde.generator.NotifyAndAllowPolicy;
 
@@ -34,6 +36,6 @@ public class PolicyFileGeneratorJSM extends SecurityManager {
      * JSM Constructor.
      */
     public PolicyFileGeneratorJSM() {
-        SecurityActions.setPolicy(new NotifyAndAllowPolicy(null, new GeneratePolicyFromDeniedPermissions()));
+        Policy.setPolicy(new NotifyAndAllowPolicy(null, new GeneratePolicyFromDeniedPermissions()));
     }
 }
diff --git a/src/main/java/net/sourceforge/prograde/sm/ProGradeJSM.java b/src/main/java/net/sourceforge/prograde/sm/ProGradeJSM.java
@@ -19,6 +19,8 @@
  */
 package net.sourceforge.prograde.sm;
 
+import java.security.Policy;
+
 import net.sourceforge.prograde.policy.ProGradePolicy;
 
 /**
@@ -34,6 +36,6 @@ public class ProGradeJSM extends SecurityManager {
      */
     public ProGradeJSM() {
         super();
-        SecurityActions.setPolicy(new ProGradePolicy());
+        Policy.setPolicy(new ProGradePolicy());
     }
 }
diff --git a/src/main/java/net/sourceforge/prograde/sm/SecurityActions.java b/src/main/java/net/sourceforge/prograde/sm/SecurityActions.java