[jboss-cvs] JBossAS SVN: r62471 - projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc.

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

Author: anil.saldhana at jboss.com
Date: 2007-04-21 02:44:54 -0400 (Sat, 21 Apr 2007)
New Revision: 62471

Modified:
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java
Log:
remove commented out code

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java	2007-04-21 06:44:16 UTC (rev 62470)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SubjectPolicyContextHandler.java	2007-04-21 06:44:54 UTC (rev 62471)
@@ -29,8 +29,7 @@
 import javax.security.jacc.PolicyContextException;
 import javax.security.jacc.PolicyContextHandler;
 
-import org.jboss.security.RunAsIdentity;
-import org.jboss.security.SecurityAssociation;
+import org.jboss.security.RunAsIdentity; 
 import org.jboss.security.SecurityContext;
 import org.jboss.security.SubjectInfo;
 import org.jboss.security.plugins.SecurityContextAssociation;
@@ -39,6 +38,7 @@
 
 /** A PolicyContextHandler for the current authenticated Subject.
  * @author Scott.Stark at jboss.org
+ * @author Anil.Saldhana at redhat.com
  * @version $Revison:$
  */
 public class SubjectPolicyContextHandler implements PolicyContextHandler
@@ -48,41 +48,7 @@
 
    private static class GetSubjectAction implements PrivilegedAction
    {
-      static PrivilegedAction ACTION = new GetSubjectAction();
-      /*public Object run()
-      {
-         Subject theSubject = null;
-         Subject activeSubject = SecurityAssociation.getSubject();
-         if( activeSubject != null )
-         {
-            Set principalsSet = null;
-            RunAsIdentity callerRunAsIdentity = (RunAsIdentity)
-               SecurityAssociation.peekRunAsIdentity(1);
-            if( callerRunAsIdentity == null )
-            {
-               principalsSet = activeSubject.getPrincipals();
-            }
-            else
-            {
-               principalsSet = callerRunAsIdentity.getPrincipalsSet();
-            }
-
-            theSubject = new Subject(true, principalsSet,
-               activeSubject.getPublicCredentials(),
-               activeSubject.getPrivateCredentials());
-         }
-         else
-         {
-            RunAsIdentity callerRunAsIdentity = (RunAsIdentity)
-               SecurityAssociation.peekRunAsIdentity(1);
-            if( callerRunAsIdentity != null )
-            {
-               Set principalsSet = callerRunAsIdentity.getPrincipalsSet();
-               theSubject = new Subject(true, principalsSet, EMPTY_SET, EMPTY_SET);
-            }
-         }
-         return theSubject;
-      }*/
+      static PrivilegedAction ACTION = new GetSubjectAction(); 
       
       public Object run()
       {
@@ -95,7 +61,7 @@
             if(si != null)
             {
                Subject activeSubject = si.getAuthenticatedSubject();
-               RunAsIdentity callerRunAsIdentity = (RunAsIdentity)sc.getUtil().get(sc, CALLER_RAI_IDENTIFIER);
+               RunAsIdentity callerRunAsIdentity = (RunAsIdentity)sc.getUtil().get(CALLER_RAI_IDENTIFIER);
                
                if( activeSubject != null )
                {