Author: markt
Date: Mon Mar 17 11:28:05 2014
New Revision: 1578310
URL: http://svn.apache.org/r1578310
Log:
Review from kkolinko
The filename of a tagged war file should be versioned + tag + baseName.war.
The "tag" part was lost.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1578309
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1578310&r1=1578309&r2=1578310&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Mon Mar 17 11:28:05 2014
@@ -739,7 +739,7 @@ public class ManagerServlet extends Http
String displayPath = cn.getDisplayName();
// Find the local WAR file
- File localWar = new File(versioned, baseName + ".war");
+ File localWar = new File(new File(versioned, tag), baseName + ".war");
File deployedWar = new File(host.getAppBase(), baseName + ".war");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
