Make sure we don't swallow exceptions when transferring a file fails

2 files changed, 1 insertions, 56 deletions

diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/EmptyFileReferenceData.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/EmptyFileReferenceData.java
deleted file mode 100644
index ea8461b42f3..00000000000
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/EmptyFileReferenceData.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.filedistribution;
-
-import com.yahoo.config.FileReference;
-
-import java.nio.ByteBuffer;
-
-public class EmptyFileReferenceData extends FileReferenceData {
-
-    private final byte[] content;
-    private final long xxhash;
-    private int contentRead = 0;
-
-    private EmptyFileReferenceData(FileReference fileReference, String filename, Type type, byte[] content, long xxhash) {
-        super(fileReference, filename, type, CompressionType.gzip);
-        this.content = content;
-        this.xxhash = xxhash;
-    }
-
-    public static FileReferenceData empty(FileReference fileReference, String filename) {
-        return new EmptyFileReferenceData(fileReference, filename, FileReferenceData.Type.file, new byte[0], 0);
-    }
-
-    public ByteBuffer content() {
-        return ByteBuffer.wrap(content);
-    }
-
-    @Override
-    public int nextContent(ByteBuffer bb) {
-        if (contentRead >= content.length) {
-            return -1;
-        } else {
-            int left = content.length - contentRead;
-            int size = Math.min(bb.remaining(), left);
-            bb.put(content, contentRead, size);
-            contentRead += size;
-            return size;
-        }
-    }
-
-    @Override
-    public long xxhash() {
-        return xxhash;
-    }
-
-    @Override
-    public long size() {
-        return content.length;
-    }
-
-    @Override
-    public void close() {
-        // no-op
-    }
-}
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
index b37fe02226b..a567a3bc4b3 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
@@ -243,7 +243,7 @@ public class FileReceiver {
         synchronized (sessions) {
             if (sessions.containsKey(sessionId)) {
                 retval = 1;
-                log.severe("Session id " + sessionId + " already exist, impossible. Request from(" + req.target() + ")");
+                log.severe("Session id " + sessionId + " already exist, impossible. Request from " + req.target());
             } else {
                 try {
                     sessions.put(sessionId, new Session(downloadDirectory, sessionId, reference,