[jboss-cvs] JBossAS SVN: r74423 - projects/jboss-aspects/trunk/security/src/main/java/org/jboss/aspects/security.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2008-06-11 17:13:24 -0400 (Wed, 11 Jun 2008)
New Revision: 74423

Modified:
   projects/jboss-aspects/trunk/security/src/main/java/org/jboss/aspects/security/SecurityActions.java
Log:
JBASPECT-23: less restrictive on SC

Modified: projects/jboss-aspects/trunk/security/src/main/java/org/jboss/aspects/security/SecurityActions.java
===================================================================
--- projects/jboss-aspects/trunk/security/src/main/java/org/jboss/aspects/security/SecurityActions.java	2008-06-11 21:12:53 UTC (rev 74422)
+++ projects/jboss-aspects/trunk/security/src/main/java/org/jboss/aspects/security/SecurityActions.java	2008-06-11 21:13:24 UTC (rev 74423)
@@ -127,24 +127,25 @@
          public Principal run()
          {
             SecurityContext sc = getSecurityContext();
-            if(sc == null)
-               throw new RuntimeException("No Security Context");
             return sc != null ? sc.getUtil().getUserPrincipal() : null; 
          }
       });
    }
 
-   static void setPrincipal(final Principal principal)
+   static void setPrincipal(final Principal principal) throws PrivilegedActionException
    {
-      AccessController.doPrivileged(new PrivilegedAction<Object>()
+      AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
       {
-         public Object run()
+         public Object run() throws Exception
          {
             Identity identity = new SimpleIdentity(principal.getName());
 
             SecurityContext sc = getSecurityContext();
             if(sc == null)
-               throw new RuntimeException("No Security Context");
+            {
+              sc = createSecurityContext();
+              setSecurityContext(sc);
+            }
             sc.getUtil().addIdentity(identity); 
             return null;
          }
@@ -158,9 +159,7 @@
          public Object run()
          {
             SecurityContext sc = getSecurityContext();
-            if(sc == null)
-               throw new RuntimeException("No Security Context");
-            return sc.getUtil().getCredential(); 
+            return sc != null ? sc.getUtil().getCredential() : null; 
          }
       });
    }
@@ -461,4 +460,4 @@
             cred, subject, domain); 
       SecurityActions.setSecurityContext(sc);
    }  
-}
\ No newline at end of file
+}