[jboss-cvs] jboss-seam/src/main/org/jboss/seam/security ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/06/07 08:05:57

  Modified:    src/main/org/jboss/seam/security  Identity.java
  Log:
  JBSEAM-1414
  
  Revision  Changes    Path
  1.87      +8 -8      jboss-seam/src/main/org/jboss/seam/security/Identity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Identity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/Identity.java,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -b -r1.86 -r1.87
  --- Identity.java	3 Jun 2007 23:02:25 -0000	1.86
  +++ Identity.java	7 Jun 2007 12:05:57 -0000	1.87
  @@ -373,11 +373,11 @@
      {      
         principal = null;
         
  -      for ( Group sg : subject.getPrincipals(Group.class) )      
  +      for ( Group sg : getSubject().getPrincipals(Group.class) )      
         {
            if ( ROLES_GROUP.equals( sg.getName() ) )
            {
  -            subject.getPrincipals().remove(sg);
  +            getSubject().getPrincipals().remove(sg);
               break;
            }
         }
  @@ -387,12 +387,12 @@
      {
         if (getJaasConfigName() != null)
         {
  -         return new LoginContext(getJaasConfigName(), subject, 
  +         return new LoginContext(getJaasConfigName(), getSubject(), 
                     getDefaultCallbackHandler());
         }
         
         return new LoginContext(Configuration.DEFAULT_JAAS_CONFIG_NAME, 
  -            subject, getDefaultCallbackHandler(), Configuration.instance());
  +               getSubject(), getDefaultCallbackHandler(), Configuration.instance());
      }
      
      public void logout()
  @@ -411,7 +411,7 @@
      {
         isLoggedIn(true);
         
  -      for ( Group sg : subject.getPrincipals(Group.class) )      
  +      for ( Group sg : getSubject().getPrincipals(Group.class) )      
         {
            if ( ROLES_GROUP.equals( sg.getName() ) )
            {
  @@ -435,7 +435,7 @@
         }
         else
         {
  -         for ( Group sg : subject.getPrincipals(Group.class) )      
  +         for ( Group sg : getSubject().getPrincipals(Group.class) )      
            {
               if ( ROLES_GROUP.equals( sg.getName() ) )
               {
  @@ -445,7 +445,7 @@
                     
            SimpleGroup roleGroup = new SimpleGroup(ROLES_GROUP);
            roleGroup.addMember(new SimplePrincipal(role));
  -         subject.getPrincipals().add(roleGroup);
  +         getSubject().getPrincipals().add(roleGroup);
            return true;
         }
      }
  @@ -457,7 +457,7 @@
       */
      public void removeRole(String role)
      {     
  -      for ( Group sg : subject.getPrincipals(Group.class) )      
  +      for ( Group sg : getSubject().getPrincipals(Group.class) )      
         {
            if ( ROLES_GROUP.equals( sg.getName() ) )
            {