cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config ContextXmlReader.java

[larryi]

larryi      01/10/19 19:52:12

  Modified:    src/share/org/apache/tomcat/modules/config
                        ContextXmlReader.java
  Log:
  Update for JDK1.1.8 on Windows since this is a requirement.
  
  Revision  Changes    Path
  1.11      +4 -1      
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ContextXmlReader.java
  
  Index: ContextXmlReader.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ContextXmlReader.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ContextXmlReader.java     2001/09/08 20:13:19     1.10
  +++ ContextXmlReader.java     2001/10/20 02:52:12     1.11
  @@ -117,9 +117,12 @@
        if (configFile == null)
            configFile=DEFAULT_CONFIG;
   
  +        if (File.separatorChar != '/')
  +            configFile=configFile.replace('/',File.separatorChar);
  +
           f=new File(configFile);
        if( !f.isAbsolute())
  -         f=new File( cm.getHome(), "/" + configFile);
  +         f=new File( cm.getHome(), configFile);
   
        if( f.exists() )
            ServerXmlReader.loadConfigFile(xh,f,cm);