Swith to a new connection if possible when asked to do so

Try to avoid reusing the same connection we want to avoid using,
only using it when there is just one source

2 files changed, 2 insertions, 5 deletions

diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
index 4ee9eacc2be..6b8a3802a2f 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -20,7 +20,6 @@ import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -125,7 +124,7 @@ public class FileReferenceDownloader {
                 return true;
             } else {
                 log.log(logLevel, "File reference '" + fileReference + "' not found for " + connection.getAddress());
-                connectionPool.setNewCurrentConnection();
+                connectionPool.switchConnection();
                 return false;
             }
         } else {
diff --git a/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java b/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java
index 52d8507acea..e35e75ce6cc 100644
--- a/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java
+++ b/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java
@@ -341,9 +341,7 @@ public class FileDownloaderTest {
         }
 
         @Override
-        public Connection setNewCurrentConnection() {
-            return this;
-        }
+        public Connection switchConnection() { return this; }
 
         @Override
         public int getSize() {