Author: markt
Date: Mon Mar 17 11:37:50 2014
New Revision: 1578313
URL: http://svn.apache.org/r1578313
Log:
kkolinko review
Use deployed which is known to be absolute
Also, deprecate use of getAppBase() method as it does not exist in 8.0.x and
use deployed instead (deployed only needs to be absolute not canonical).
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1578313&r1=1578312&r2=1578313&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Mon Mar 17 11:37:50 2014
@@ -258,7 +258,7 @@ public final class HTMLManagerServlet ex
// Identify the appBase of the owning Host of this Context
// (if any)
- File file = new File(getAppBase(), filename);
+ File file = new File(deployed, filename);
if (file.exists()) {
message = smClient.getString(
"htmlManagerServlet.deployUploadWarExists",
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=1578313&r1=1578312&r2=1578313&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:37:50 2014
@@ -741,7 +741,7 @@ public class ManagerServlet extends Http
// Find the local WAR file
File localWar = new File(new File(versioned, tag), baseName + ".war");
- File deployedWar = new File(host.getAppBase(), baseName + ".war");
+ File deployedWar = new File(deployed, baseName + ".war");
// Copy WAR to appBase
try {
@@ -865,9 +865,9 @@ public class ManagerServlet extends Http
if (war != null) {
File localWar;
if (war.endsWith(".war")) {
- localWar = new File(getAppBase(), baseName +
".war");
+ localWar = new File(deployed, baseName + ".war");
} else {
- localWar = new File(getAppBase(), baseName);
+ localWar = new File(deployed, baseName);
}
if (localWar.exists() && !ExpandWar.delete(localWar)) {
writer.println(smClient.getString(
@@ -1388,8 +1388,8 @@ public class ManagerServlet extends Http
ExceptionUtils.handleThrowable(t);
}
try {
- File war = new File(getAppBase(), baseName + ".war");
- File dir = new File(getAppBase(), baseName);
+ File war = new File(deployed, baseName + ".war");
+ File dir = new File(deployed, baseName);
File xml = new File(configBase, baseName + ".xml");
if (war.exists() && !war.delete()) {
writer.println(smClient.getString(
@@ -1428,7 +1428,10 @@ public class ManagerServlet extends Http
/**
* Return a File object representing the "application root" directory
* for our associated Host.
+ *
+ * @deprecated Unused
*/
+ @Deprecated
protected File getAppBase() {
if (appBase != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
