Wire in receiving files

2 files changed, 7 insertions, 4 deletions

diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionRpcServer.java
index 552758bcfa4..46b1ffc721e 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionRpcServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionRpcServer.java
@@ -138,11 +138,13 @@ public class FileDistributionRpcServer {
         String filename = req.parameters().get(1).asString();
         byte[] content = req.parameters().get(2).asData();
         long xxhash = req.parameters().get(3).asInt64();
-        int errorCode = req.parameters().get(3).asInt32();
-        String errorDescription = req.parameters().get(4).asString();
+        int errorCode = req.parameters().get(4).asInt32();
+        String errorDescription = req.parameters().get(5).asString();
 
         if (errorCode == 0) {
-            //downloader.receive(fileReference, filename, content);
+            // TODO: Remove when system test works
+            log.log(LogLevel.INFO, "Receiving file reference '" + fileReference.value() + "'");
+            downloader.receiveFile(fileReference, filename, content);
             req.returnValues().add(new Int32Value(0));
         } else {
             log.log(LogLevel.WARNING, "Receiving file reference '" + fileReference.value() + "' failed: " + errorDescription);
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileReferenceDownloader.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileReferenceDownloader.java
index 611ad67a5d8..4b32ffab2b7 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileReferenceDownloader.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileReferenceDownloader.java
@@ -118,7 +118,8 @@ class FileReferenceDownloader {
     }
 
     private synchronized void completedDownloading(FileReference fileReference, File file) {
-        downloads.get(fileReference).future().set(Optional.of(file));
+        if (downloads.containsKey(fileReference))
+            downloads.get(fileReference).future().set(Optional.of(file));
         downloadStatus.put(fileReference, 100.0);
     }