From b46c328811bfb0a055c599c7b888710a7b6930b9 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sun, 15 Aug 2021 21:50:19 +0100 Subject: [PATCH] Fixed bug in FilesystemUtils.copyAndReplaceDirectory() --- src/main/java/org/qortal/utils/FilesystemUtils.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/qortal/utils/FilesystemUtils.java b/src/main/java/org/qortal/utils/FilesystemUtils.java index 1bfdea78..bbf54e74 100644 --- a/src/main/java/org/qortal/utils/FilesystemUtils.java +++ b/src/main/java/org/qortal/utils/FilesystemUtils.java @@ -29,6 +29,12 @@ public class FilesystemUtils { throw new IOException("Destination directory doesn't exist"); } + // If the destination directory isn't empty, delete its contents + if (!FilesystemUtils.isDirectoryEmpty(destFile.toPath())) { + FileUtils.deleteDirectory(destFile); + destFile.mkdirs(); + } + Files.walk(Paths.get(sourceDirectoryLocation)) .forEach(source -> { Path destination = Paths.get(destinationDirectoryLocation, source.toString()