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

[Shane Bryzak]

  User: sbryzak2
  Date: 06/10/10 23:09:08

  Modified:    src/main/org/jboss/seam/security/adapter/jboss 
                        SeamLoginModule.java
  Log:
  Replaced class.forName() with Reflections.classForName()
  
  Revision  Changes    Path
  1.5       +6 -3      jboss-seam/src/main/org/jboss/seam/security/adapter/jboss/SeamLoginModule.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamLoginModule.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/adapter/jboss/SeamLoginModule.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- SeamLoginModule.java	5 Aug 2006 01:57:53 -0000	1.4
  +++ SeamLoginModule.java	11 Oct 2006 03:09:08 -0000	1.5
  @@ -18,7 +18,7 @@
   import javax.security.auth.spi.LoginModule;
   
   import org.jboss.seam.security.Authentication;
  -import org.jboss.seam.security.config.SecurityConfig;
  +import org.jboss.seam.util.Reflections;
   
   /**
    *
  @@ -40,6 +40,7 @@
     private CallbackHandler callbackHandler;
   
     private Authentication authentication;
  +  private Group roles;
   
     public boolean abort()
     {
  @@ -89,7 +90,7 @@
     protected Group createGroup(String name, Set<Principal> principals)
         throws Exception
     {
  -    Group roles = null;
  +    roles = null;
       for (Principal principal : principals)
       {
         if (! (principal instanceof Group))
  @@ -121,7 +122,7 @@
     {
       if (simplePrincipalConstructor == null)
       {
  -      Class cls = Class.forName(SIMPLE_PRINCIPAL_CLASS);
  +      Class cls = Reflections.classForName(SIMPLE_PRINCIPAL_CLASS);
         simplePrincipalConstructor = cls.getConstructor(String.class);
       }
       return (Principal) simplePrincipalConstructor.newInstance(name);
  @@ -234,6 +235,8 @@
     {
       Set principals = subject.getPrincipals();
       principals.remove(authentication);
  +    if (roles != null)
  +      principals.remove(roles);
       return true;
     }
   }