Merge pull request #4119 from vespa-engine/hmusum/support-directory-as-filereference

Support directory as file reference

2 files changed, 5 insertions, 5 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java
index 79c541d7b1a..0d1aae97690 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java
@@ -15,9 +15,7 @@ public class ApplicationFileManager implements AddFileInterface {
 
     @Override
     public FileReference addFile(String relativePath, FileReference reference) {
-        // TODO Wire in when verified in system test
-        // return master.addFile(new File(applicationDir, relativePath), reference);
-        return reference;
+        return master.addFile(new File(applicationDir, relativePath), reference);
     }
 
     @Override
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
index b0042b15470..7d0ba6cd9bd 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
@@ -5,7 +5,6 @@ package com.yahoo.vespa.config.server.filedistribution;
 import com.yahoo.config.FileReference;
 import com.yahoo.config.model.api.FileDistribution;
 import com.yahoo.io.IOUtils;
-import com.yahoo.log.LogLevel;
 import com.yahoo.text.Utf8;
 import net.jpountz.xxhash.XXHash64;
 import net.jpountz.xxhash.XXHashFactory;
@@ -100,7 +99,10 @@ public class FileDirectory  {
                 destinationDir.mkdir();
                 Path tempDestinationDir = Files.createTempDirectory(root.toPath(), "writing");
                 File destination = new File(tempDestinationDir.toFile(), source.getName());
-                IOUtils.copy(source, destination);
+                if (source.isDirectory())
+                    IOUtils.copyDirectory(source, destination);
+                else
+                    IOUtils.copy(source, destination);
                 if (!destinationDir.exists()) {
                     if ( ! tempDestinationDir.toFile().renameTo(destinationDir)) {
                         log.warning("Failed moving '" + tempDestinationDir.toFile().getAbsolutePath() + "' to '" + destination.getAbsolutePath() + "'.");