larryi      01/11/13 19:01:16

  Modified:    src/share/org/apache/tomcat/modules/config AutoWebApp.java
  Log:
  Slightly altered patch to allow absolute paths for the web application
  directory on Windows.  Bugzilla #4826
  
  Submitted by: Tom Quarendon
  
  Revision  Changes    Path
  1.10      +4 -7      
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoWebApp.java
  
  Index: AutoWebApp.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoWebApp.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AutoWebApp.java   2001/08/24 02:24:18     1.9
  +++ AutoWebApp.java   2001/11/14 03:01:16     1.10
  @@ -182,13 +182,10 @@
            loaded.put( ctx.getPath(), ctx );
        }
        
  -     String home=cm.getHome();
  -     File webappD;
  -     
  -     if( appsD.startsWith( "/" ) ) 
  -         webappD=new File(appsD);
  -     else
  -         webappD=new File(home + "/" + appsD);
  +        File webappD=new File(appsD);
  +        if( !webappD.isAbsolute() ) {
  +            webappD=new File( cm.getHome(), appsD);
  +        }
        
        if (! webappD.exists() || ! webappD.isDirectory()) {
            log("No autoconf directory " + webappD );
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to