cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util PrefixMapper.java

[costin]

costin      01/04/03 21:04:50

  Modified:    src/share/org/apache/tomcat/util PrefixMapper.java
  Log:
  One bug in a previous fix, test host!=null.
  
  Revision  Changes    Path
  1.10      +8 -7      
jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java
  
  Index: PrefixMapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- PrefixMapper.java 2001/03/31 21:48:00     1.9
  +++ PrefixMapper.java 2001/04/04 04:04:49     1.10
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java,v 1.9 
2001/03/31 21:48:00 costin Exp $
  - * $Revision: 1.9 $
  - * $Date: 2001/03/31 21:48:00 $
  + * $Header: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java,v 1.10 
2001/04/04 04:04:49 costin Exp $
  + * $Revision: 1.10 $
  + * $Date: 2001/04/04 04:04:49 $
    *
    * ====================================================================
    *
  @@ -123,8 +123,8 @@
        */
       public void removeAllMappings( String host, String path ) {
        PrefixMapper vmap=this;
  -     host=host.toLowerCase();
        if( host!=null ) {
  +         host=host.toLowerCase();
            vmap=(PrefixMapper)vhostMaps.get(host);
        }
        
  @@ -207,10 +207,11 @@
           String s = path;
   
        PrefixMapper myMap=null;
  -     if( host!=null )
  +     if( host!=null ) {
            myMap=(PrefixMapper)vhostMaps.get( host );
  -     if( myMap==null ) {
  -         myMap=(PrefixMapper)vhostMaps.get( host.toLowerCase() );
  +         if( myMap==null ) {
  +             myMap=(PrefixMapper)vhostMaps.get( host.toLowerCase() );
  +         }
        }
        
        if( myMap==null ) myMap = this; // default server