remm 2003/07/25 09:40:56
Modified: webapps/manager/WEB-INF/classes/org/apache/catalina/manager
ManagerServlet.java
Log:
- The work directory wasn't removed on undeploy.
Revision Changes Path
1.6 +7 -6
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ManagerServlet.java 24 Jun 2003 23:17:23 -0000 1.5
+++ ManagerServlet.java 25 Jul 2003 16:40:55 -0000 1.6
@@ -1375,8 +1375,9 @@
writer.println(sm.getString("managerServlet.noSelf"));
return;
}
- deployer.remove(path);
- if (docBaseDir.isDirectory()) {
+ boolean dir = docBaseDir.isDirectory();
+ deployer.remove(path, true);
+ if (dir) {
undeployDir(docBaseDir);
// Delete the WAR file
File docBaseWar = new File(docBasePath + ".war");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
