From e1a47d5e9a82251ec76728943e7b5559d0b96e7c Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@oath.com>
Date: Tue, 7 Nov 2017 11:22:04 +0100
Subject: Synchronize access when making copy in the right place

---
 .../com/yahoo/vespa/config/proxy/filedistribution/FileDownloader.java | 2 +-
 .../vespa/config/proxy/filedistribution/FileReferenceDownloader.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'config-proxy')

diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDownloader.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDownloader.java
index 21e9b7f160b..3977bbd5bfb 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDownloader.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDownloader.java
@@ -142,7 +142,7 @@ public class FileDownloader {
     }
 
     ImmutableSet<FileReference> queuedForDownload() {
-        return ImmutableSet.copyOf(fileReferenceDownloader.queuedForDownload().keySet());
+        return ImmutableSet.copyOf(fileReferenceDownloader.queuedForDownload());
     }
 
 }
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 07b2094ef35..775a50cfb37 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
@@ -81,8 +81,8 @@ class FileReferenceDownloader {
         }
     }
 
-    Map<FileReference, SettableFuture<Optional<File>>> queuedForDownload() {
-        return queuedForDownload;
+    synchronized ImmutableSet<FileReference> queuedForDownload() {
+        return ImmutableSet.copyOf(queuedForDownload.keySet());
     }
 
     private synchronized void completedDownloading(FileReference fileReference, File file) {
-- 
cgit v1.2.3