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/startup SetDocBaseRule.java
Date Sat, 27 Sep 2003 12:06:32 GMT
remm        2003/09/27 05:06:32

  Modified:    catalina/src/share/org/apache/catalina/startup
                        SetDocBaseRule.java
  Log:
  - Fix handling of root context when upacking a WAR. Note that obviously
    using a context path with a WAR which doesn't match the name will result
    in the webapp being deployed twice.
  
  Revision  Changes    Path
  1.9       +8 -4      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetDocBaseRule.java
  
  Index: SetDocBaseRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetDocBaseRule.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SetDocBaseRule.java	8 Sep 2003 13:43:40 -0000	1.8
  +++ SetDocBaseRule.java	27 Sep 2003 12:06:32 -0000	1.9
  @@ -172,7 +172,11 @@
   
           if (docBase.toLowerCase().endsWith(".war")) {
               URL war = new URL("jar:" + (new File(docBase)).toURL() + "!/");
  -            docBase = ExpandWar.expand(host, war, child.getPath());
  +            String contextPath = child.getPath();
  +            if (contextPath.equals("")) {
  +                contextPath = "ROOT";
  +            }
  +            docBase = ExpandWar.expand(host, war, contextPath);
               file = new File(docBase);
               docBase = file.getCanonicalPath();
           } else {
  
  
  

Mime
View raw message