tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java
Date Tue, 24 Jun 2003 21:36:49 GMT
remm        2003/06/24 14:36:49

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  - Escape '/' in the configFile name.
  
  Revision  Changes    Path
  1.68      +2 -7      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- StandardContext.java	22 Jun 2003 17:14:24 -0000	1.67
  +++ StandardContext.java	24 Jun 2003 21:36:49 -0000	1.68
  @@ -3863,17 +3863,12 @@
           // Set config file name
           File configBase = getConfigBase();
           if ((getConfigFile() == null) && (configBase != null)) {
  -
               String name = getName();
               if (name.equals("")) {
                   name = "ROOT";
               }
  -            File file = new File(configBase, name + ".xml");
  -
  +            File file = new File(configBase, name.replace('/', '_') + ".xml");
               setConfigFile(file.getPath());
  -            if (log.isDebugEnabled())
  -                log.debug( "Set config file " + file);
  -
           }
   
           // Add missing components as necessary
  
  
  

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


Mime
View raw message