AS7-4087: remove the static tags on the methods in SimpleSecurityManager

silveringsea · Mar 10, 2012 · ef9ca41 · ef9ca41
1 parent d5dc2d8
commit ef9ca41
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/security/src/main/java/org/jboss/as/security/SecurityMessages.java b/security/src/main/java/org/jboss/as/security/SecurityMessages.java
@@ -245,4 +245,11 @@ public interface SecurityMessages {
      */
     @Message(id = 13323, value = "Invalid User")
     SecurityException invalidUserException();
+
+    /**
+     * Create a {@link SecurityException} to indicate that the security management has not been injected
+     * @return {@link SecurityException}
+     */
+    @Message(id = 13324, value = "Security Management not injected")
+    SecurityException securityManagementNotInjected();
 }
diff --git a/security/src/main/java/org/jboss/as/security/service/SimpleSecurityManager.java b/security/src/main/java/org/jboss/as/security/service/SimpleSecurityManager.java
@@ -67,20 +67,22 @@
 public class SimpleSecurityManager {
     private ThreadLocalStack<SecurityContext> contexts = new ThreadLocalStack<SecurityContext>();
 
-    private static ISecurityManagement securityManagement = null;
+    private ISecurityManagement securityManagement = null;
 
-    private static PrivilegedAction<SecurityContext> securityContext() {
+    private PrivilegedAction<SecurityContext> securityContext() {
         return new PrivilegedAction<SecurityContext>() {
             public SecurityContext run() {
                 return SecurityContextAssociation.getSecurityContext();
             }
         };
     }
 
-    private static SecurityContext establishSecurityContext(final String securityDomain) {
+    private SecurityContext establishSecurityContext(final String securityDomain) {
         // Do not use SecurityFactory.establishSecurityContext, its static init is broken.
         try {
             final SecurityContext securityContext = SecurityContextFactory.createSecurityContext(securityDomain);
+            if(securityManagement == null)
+                throw SecurityMessages.MESSAGES.securityManagementNotInjected();
             securityContext.setSecurityManagement(securityManagement);
             SecurityContextAssociation.setSecurityContext(securityContext);
             return securityContext;