tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/webapp/java WarpConfigurationHandler.java
Date Mon, 22 Oct 2001 16:12:52 GMT
pier        01/10/22 09:12:52

  Modified:    webapp/java WarpConfigurationHandler.java
  Log:
  Fix for absolute paths to web-applications used in the first parameter
  to WebAppDeploy
  
  Revision  Changes    Path
  1.16      +6 -3      jakarta-tomcat-connectors/webapp/java/WarpConfigurationHandler.java
  
  Index: WarpConfigurationHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/java/WarpConfigurationHandler.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- WarpConfigurationHandler.java	2001/09/17 05:03:24	1.15
  +++ WarpConfigurationHandler.java	2001/10/22 16:12:52	1.16
  @@ -286,10 +286,13 @@
                   logger.debug("No application for \""+applPath+"\"");
   
               Deployer deployer=(Deployer)host;
  -            File file=new File(host.getAppBase()+File.separator+applName);
  +            File file=new File(applName);
               if (!file.isAbsolute()) {
  -                file=new File(System.getProperty("catalina.base"),
  -                              host.getAppBase()+File.separator+applName);
  +                file=new File(host.getAppBase()+File.separator+applName);
  +                if (!file.isAbsolute()) {
  +               	    file=new File(System.getProperty("catalina.base"),
  +                                  host.getAppBase()+File.separator+applName);
  +                }
               }
   
               if (!file.exists()) {
  
  
  

Mime
View raw message