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

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

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

Modified:
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JaasSecurityManager.java
Log:
use security context to return the subject

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JaasSecurityManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JaasSecurityManager.java	2007-04-21 06:26:41 UTC (rev 62454)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JaasSecurityManager.java	2007-04-21 06:31:54 UTC (rev 62455)
@@ -37,8 +37,8 @@
 
 import org.jboss.logging.Logger; 
 import org.jboss.security.AuthorizationManager; 
-import org.jboss.security.RealmMapping;
-import org.jboss.security.SecurityAssociation; 
+import org.jboss.security.RealmMapping; 
+import org.jboss.security.SecurityContext;
 import org.jboss.security.SubjectSecurityManager;
 import org.jboss.security.Util; 
 import org.jboss.security.auth.callback.SecurityAssociationHandler;
@@ -300,7 +300,14 @@
          must have the correct permissions to access the
          SecurityAssociation.getSubject method.
       */
-      return SecurityAssociation.getSubject();
+      //return SecurityAssociation.getSubject();
+      Subject subj = null;
+      SecurityContext sc = SecurityContextAssociation.getSecurityContext();
+      if(sc != null)
+      {
+         subj = sc.getUtil().getSubject();
+      }
+      return subj;
    }
 
    /** Validate that the given credential is correct for principal. This