Author: markt
Date: Thu Nov 15 15:11:29 2018
New Revision: 1846664
URL: http://svn.apache.org/viewvc?rev=1846664&view=rev
Log:
Refactor to remove duplicate functionality (reported by Simian)
Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1846664&r1=1846663&r2=1846664&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Thu Nov
15 15:11:29 2018
@@ -1538,7 +1538,7 @@ public class ManagerServlet extends Http
writer.println(smClient.getString(
"managerServlet.deleteFail", war));
return;
- } else if (dir.exists() && !undeployDir(dir)) {
+ } else if (dir.exists() && !ExpandWar.delete(dir, false)) {
writer.println(smClient.getString(
"managerServlet.deleteFail", dir));
return;
@@ -1644,35 +1644,6 @@ public class ManagerServlet extends Http
}
- /**
- * Delete the specified directory, including all of its contents and
- * subdirectories recursively. The code assumes that the directory exists.
- *
- * @param dir File object representing the directory to be deleted.
- * @return <code>true</code> if the deletion was successful
- */
- protected boolean undeployDir(File dir) {
-
- String files[] = dir.list();
- if (files == null) {
- files = new String[0];
- }
- for (int i = 0; i < files.length; i++) {
- File file = new File(dir, files[i]);
- if (file.isDirectory()) {
- if (!undeployDir(file)) {
- return false;
- }
- } else {
- if (!file.delete()) {
- return false;
- }
- }
- }
- return dir.delete();
- }
-
-
/**
* Upload the WAR file included in this request, and store it at the
* specified file location.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
