tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardHostDeployer.java
Date Wed, 07 Jan 2004 23:34:31 GMT
markt       2004/01/07 15:34:31

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardHostDeployer.java
  Log:
  - Apply same patch as for bug 11682 to second ExpandWar.expand()
  
  Revision  Changes    Path
  1.18      +6 -2      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java
  
  Index: StandardHostDeployer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- StandardHostDeployer.java	6 Jan 2004 22:31:18 -0000	1.17
  +++ StandardHostDeployer.java	7 Jan 2004 23:34:31 -0000	1.18
  @@ -297,7 +297,11 @@
   
           // Expand war file if host wants wars unpacked
           if (isWAR && host.isUnpackWARs()) {
  -            docBase = ExpandWar.expand(host, war, contextPath);
  +            if (contextPath.equals("")) {
  +                docBase = ExpandWar.expand(host, war, "/ROOT");
  +            } else {
  +                docBase = ExpandWar.expand(host, war, contextPath);
  +            }
           }
   
           // Install the new web application
  
  
  

---------------------------------------------------------------------
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