remm 2004/01/08 03:09:03
Modified: webapps/manager/WEB-INF/classes/org/apache/catalina/manager
ManagerServlet.java
Log:
- Undeploy should be called with the displayed path to be able to work on
the root context.
- Bug 25948.
- Submitted by Peter Rossbach.
Revision Changes Path
1.14 +8 -8
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
Index: ManagerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ManagerServlet.java 29 Nov 2003 08:33:48 -0000 1.13
+++ ManagerServlet.java 8 Jan 2004 11:09:03 -0000 1.14
@@ -617,7 +617,7 @@
Context context = deployer.findDeployedApp(path);
if (update) {
if (context != null) {
- undeploy(writer, path);
+ undeploy(writer, displayPath);
}
context = deployer.findDeployedApp(path);
}
@@ -735,7 +735,7 @@
// Check if app already exists, or undeploy it if updating
Context context = deployer.findDeployedApp(path);
if (context != null) {
- undeploy(writer, path);
+ undeploy(writer, displayPath);
}
// Copy WAR and XML to the host base
@@ -912,7 +912,7 @@
Context context = deployer.findDeployedApp(path);
if (update) {
if (context != null) {
- undeploy(writer, path);
+ undeploy(writer, displayPath);
}
context = deployer.findDeployedApp(path);
}
@@ -1599,7 +1599,7 @@
* specified file location.
*
* @param request The servlet request we are processing
- * @param file The file into which we should store the uploaded WAR
+ * @param war The file into which we should store the uploaded WAR
*
* @exception IOException if an I/O error occurs during processing
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
