[FIXED JENKINS-19574] Restore backward compatibility in prebuild cleanup

jenkinsci · Sep 15, 2013 · 267f36c · 267f36c
1 parent 10cb090
commit 267f36c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/ws_cleanup/PreBuildCleanup.java b/src/main/java/hudson/plugins/ws_cleanup/PreBuildCleanup.java
@@ -88,7 +88,9 @@ public void preCheckout(AbstractBuild build, Launcher launcher,
 					try {
 						if (ws == null || !ws.exists())
 							return;
-						if (patterns == null || patterns.isEmpty()) {
+						if ((patterns == null || patterns.isEmpty()) && (externalDelete == null || externalDelete.isEmpty())) {
+						    ws.deleteRecursive();
+						} else {
 							build.getWorkspace().act(new Cleanup(patterns,deleteDirs, build.getBuiltOn().getNodeProperties().get(
                                 EnvironmentVariablesNodeProperty.class), externalDelete, listener));
 						}

diff --git a/src/main/java/hudson/plugins/ws_cleanup/WsCleanup.java b/src/main/java/hudson/plugins/ws_cleanup/WsCleanup.java
@@ -158,10 +158,9 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         		listener.getLogger().append("Skipped based on build state " + build.getResult() + "\n\n");
         		return true;
         	}
-            if ((patterns == null || patterns.isEmpty()) && externalDelete.length() == 0) {
+            if ((patterns == null || patterns.isEmpty()) && (externalDelete == null || externalDelete.isEmpty())) {
                 workspace.deleteRecursive();
             } else {
-
                 workspace.act(
                         new Cleanup(
                             patterns,