Revert "Copy to temp dir and move"

1 files changed, 2 insertions, 7 deletions

diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
index fc93bd8b97b..ffc975d8668 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
@@ -611,16 +611,11 @@ public class FilesApplicationPackage implements ApplicationPackage {
 
     @Override
     public ApplicationPackage preprocess(Zone zone, DeployLogger logger) throws IOException {
-        File tempDir = Files.createTempDirectory("preprocessed").toFile();
-        IOUtils.copyDirectory(appDir, tempDir, -1, (dir, name) -> ! name.equals(preprocessed) &&
+        IOUtils.recursiveDeleteDir(preprocessedDir);
+        IOUtils.copyDirectory(appDir, preprocessedDir, -1, (dir, name) -> ! name.equals(preprocessed) &&
                                                                                          ! name.equals(SERVICES) &&
                                                                                          ! name.equals(HOSTS) &&
                                                                                          ! name.equals(CONFIG_DEFINITIONS_DIR));
-        if (preprocessedDir.exists()) {
-            log.log(Level.INFO, "Preprocessed directory " + preprocessedDir.getAbsolutePath() + " already exists, deleting it");
-            IOUtils.recursiveDeleteDir(preprocessedDir);
-        }
-        Files.move(tempDir.toPath(), preprocessedDir.toPath());
         preprocessXML(new File(preprocessedDir, SERVICES), getServicesFile(), zone);
         preprocessXML(new File(preprocessedDir, HOSTS), getHostsFile(), zone);
         FilesApplicationPackage preprocessed = FilesApplicationPackage.fromFile(preprocessedDir, includeSourceFiles);