Issue #5480 - NPE protection on IO.delete(File)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Oct 20, 2020 · 0e98c37 · 0e98c37
1 parent 4ecaf30
commit 0e98c37
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/IO.java b/jetty-util/src/main/java/org/eclipse/jetty/util/IO.java
@@ -361,10 +361,13 @@ public static String toString(Reader in)
      * This delete will recursively delete directories - BE CAREFUL
      *
      * @param file The file (or directory) to be deleted.
-     * @return true if anything was deleted. (note: this does not mean that all content in a directory was deleted)
+     * @return true if file was deleted, or directory referenced was deleted.
+     * false if file doesn't exist, or was null.
      */
     public static boolean delete(File file)
     {
+        if (file == null)
+            return false;
         if (!file.exists())
             return false;
         if (file.isDirectory())