Merge pull request #16 from batmat/remove-spurious-warning

[JENKINS-50439] Remove spurious warning when starting Jenkins
jenkinsci · Mar 28, 2018 · 1d2a1c7 · 1d2a1c7
2 parents 091c30f + c62b89d
commit 1d2a1c7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Changelog
 ====
 
+### 1.39
+
+Release date: Mar 28, 2018
+
+* [JENKINS-50439](https://issues.jenkins-ci.org/browse/JENKINS-50439) -
+  Remove spurious "Failed to delete the temporary Winstone file /tmp/winstone/jenkins-2.x.war" warning when starting Jenkins
+
 ### 1.38
 
 Release date: Mar 10, 2018

diff --git a/src/main/java/Main.java b/src/main/java/Main.java
@@ -475,6 +475,10 @@ private static void deleteContentsFromFolder(File folder, final String...pattern
     }
 
     private static void deleteWinstoneTempContents(File file) throws IOException {
+        if (!file.exists()) {
+            LOGGER.log(Level.FINEST, "No file found at {0}, nothing to delete.", file);
+            return;
+        }
         if(file.isDirectory()) {
             File[] files = file.listFiles();
             if(files!=null) {// be defensive