diff options
| author | Harald Musum <musum@oath.com> | 2017-11-07 11:22:04 +0100 |
|---|---|---|
| committer | Harald Musum <musum@oath.com> | 2017-11-07 11:22:04 +0100 |
| commit | e1a47d5e9a82251ec76728943e7b5559d0b96e7c (patch) | |
| tree | a82309ba01933d995a45f32a8d39716c46e41ac2 /config-proxy | |
| parent | 3844115235cf56c977aa580a3cd56f81ebfcc520 (diff) | |
Synchronize access when making copy in the right place
Diffstat (limited to 'config-proxy')
2 files changed, 3 insertions, 3 deletions
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) { |