From c8621061bfef938fbefa7edf1f779a67b9e0dd58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Thu, 25 Feb 2021 17:29:14 +0100 Subject: [PATCH] Overwrite files on import --- .../java/sonia/scm/store/FileBasedStoreEntryImporter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scm-dao-xml/src/main/java/sonia/scm/store/FileBasedStoreEntryImporter.java b/scm-dao-xml/src/main/java/sonia/scm/store/FileBasedStoreEntryImporter.java index 040892abb5..f9f81d8c14 100644 --- a/scm-dao-xml/src/main/java/sonia/scm/store/FileBasedStoreEntryImporter.java +++ b/scm-dao-xml/src/main/java/sonia/scm/store/FileBasedStoreEntryImporter.java @@ -33,6 +33,8 @@ import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; +import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; + class FileBasedStoreEntryImporter implements StoreEntryImporter { private final Path directory; @@ -50,7 +52,7 @@ class FileBasedStoreEntryImporter implements StoreEntryImporter { public void importEntry(String name, InputStream stream) { Path filePath = directory.resolve(name); try { - Files.copy(stream, filePath); + Files.copy(stream, filePath, REPLACE_EXISTING); } catch (IOException e) { throw new ImportFailedException( ContextEntry.ContextBuilder.noContext(),