diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-08 16:45:48 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-08 16:45:48 +0100 |
commit | 6bffc191b8689e0dac623d0db90790719a896634 (patch) | |
tree | 05debfc60b67988c0df65eb74a3c374bbf716b09 /configserver | |
parent | f4a20225fe622e91fed4c220da09634f97229ea3 (diff) |
Make a abstract FileReferenceData so it can cater for both whole files and chunked files.
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java index b1277682849..b228f0ca5c8 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java @@ -20,6 +20,7 @@ import com.yahoo.vespa.config.server.ConfigServerSpec; import com.yahoo.vespa.filedistribution.CompressedFileReference; import com.yahoo.vespa.filedistribution.FileDownloader; import com.yahoo.vespa.filedistribution.FileReferenceData; +import com.yahoo.vespa.filedistribution.FileReferenceDataBlob; import java.io.File; import java.io.IOException; @@ -110,7 +111,7 @@ public class FileServer { log.info("Start serving reference '" + reference.value() + "' with file '" + file.getAbsolutePath() + "'"); boolean success = false; String errorDescription = "OK"; - FileReferenceData fileData = FileReferenceData.empty(reference, file.getName()); + FileReferenceData fileData = FileReferenceDataBlob.empty(reference, file.getName()); try { fileData = readFileReferenceData(reference); success = true; @@ -138,7 +139,7 @@ public class FileServer { blob = IOUtils.readFileBytes(file); } - return new FileReferenceData(reference, file.getName(), type, blob); + return new FileReferenceDataBlob(reference, file.getName(), type, blob); } public void serveFile(Request request, Receiver receiver) { pullExecutor.execute(() -> serveFile(request.parameters().get(0).asString(), request, receiver)); |