tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm MemoryRuleSet.java
Date Fri, 08 Feb 2002 16:19:57 GMT
craigmcc    02/02/08 08:19:57

  Modified:    catalina/src/share/org/apache/catalina/realm
                        MemoryRuleSet.java
  Log:
  Make MemoryRealm robust in terms of reading users with a "username" attribute
  (as is written by UserDatabase) *or* a "name" attribute.
  
  Revision  Changes    Path
  1.2       +7 -4      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/MemoryRuleSet.java
  
  Index: MemoryRuleSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/MemoryRuleSet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MemoryRuleSet.java	17 Oct 2001 00:44:02 -0000	1.1
  +++ MemoryRuleSet.java	8 Feb 2002 16:19:57 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/MemoryRuleSet.java,v
1.1 2001/10/17 00:44:02 craigmcc Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/10/17 00:44:02 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/MemoryRuleSet.java,v
1.2 2002/02/08 16:19:57 craigmcc Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/02/08 16:19:57 $
    *
    * ====================================================================
    *
  @@ -74,7 +74,7 @@
    * XML file processed by <code>MemoryRealm</code>.</p>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.1 $ $Date: 2001/10/17 00:44:02 $
  + * @version $Revision: 1.2 $ $Date: 2002/02/08 16:19:57 $
    */
   
   public class MemoryRuleSet extends RuleSetBase {
  @@ -169,6 +169,9 @@
       public void begin(Attributes attributes) throws Exception {
   
           String username = attributes.getValue("name");
  +        if (username == null) {
  +            username = attributes.getValue("username");
  +        }
           String password = attributes.getValue("password");
           String roles = attributes.getValue("roles");
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message