Fix file deletion bug

stafanRay · Jun 17, 2019 · a2d4991 · a2d4991
1 parent 1d5bfc7
commit a2d4991
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/src/main/java/run/halo/app/utils/FileUtils.java b/src/main/java/run/halo/app/utils/FileUtils.java
@@ -66,25 +66,16 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
     public static void deleteFolder(@NonNull Path deletingPath) throws IOException {
         Assert.notNull(deletingPath, "Deleting path must not be null");
 
+        if (Files.notExists(deletingPath)) {
+            return;
+        }
+
         log.info("Deleting [{}]", deletingPath);
 
         // Delete folder recursively
         org.eclipse.jgit.util.FileUtils.delete(deletingPath.toFile(),
                 org.eclipse.jgit.util.FileUtils.RECURSIVE | org.eclipse.jgit.util.FileUtils.RETRY);
 
-//        try (Stream<Path> pathStream = Files.walk(deletingPath)) {
-//            pathStream.sorted(Comparator.reverseOrder())
-//                    .peek(path -> log.debug("Try to delete [{}]", path.toString()))
-//                    .forEach(path -> {
-//                        try {
-//                            Files.delete(path);
-//                            log.debug("Deleted [{}] successfully", path.toString());
-//                        } catch (IOException e) {
-//                            throw new ServiceException("Failed to delete " + path.toString(), e).setErrorData(deletingPath.toString());
-//                        }
-//                    });
-//        }
-
         log.info("Deleted [{}] successfully", deletingPath);
     }