diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-02-18 23:45:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-18 23:45:54 +0100 |
commit | 5721b66f784b8e95de1fbae0b00f78e323e2fb26 (patch) | |
tree | 1685c48d7d41ac59289cbfc929ea8eec81c52825 /config-proxy/src | |
parent | 1722f6cde7ffd77089694ddc489188076b18d490 (diff) |
Revert "Balder/remove config race"
Diffstat (limited to 'config-proxy/src')
-rw-r--r-- | config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java index 528c61fe132..a52aa6d7216 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java @@ -7,7 +7,6 @@ import com.yahoo.config.subscription.impl.GenericConfigHandle; import com.yahoo.config.subscription.impl.GenericConfigSubscriber; import com.yahoo.config.subscription.impl.JRTConfigRequester; import com.yahoo.log.LogLevel; -import com.yahoo.vespa.config.ConfigKey; import com.yahoo.yolean.Exceptions; import com.yahoo.vespa.config.RawConfig; import com.yahoo.vespa.config.TimingValues; @@ -31,10 +30,12 @@ public class UpstreamConfigSubscriber implements Subscriber { private GenericConfigSubscriber subscriber; private GenericConfigHandle handle; - UpstreamConfigSubscriber(RawConfig config, ClientUpdater clientUpdater, ConfigSource configSourceSet, - TimingValues timingValues, Map<ConfigSourceSet, JRTConfigRequester> requesterPool, - MemoryCache memoryCache) - { + UpstreamConfigSubscriber(RawConfig config, + ClientUpdater clientUpdater, + ConfigSource configSourceSet, + TimingValues timingValues, + Map<ConfigSourceSet, JRTConfigRequester> requesterPool, + MemoryCache memoryCache) { this.config = config; this.clientUpdater = clientUpdater; this.configSourceSet = configSourceSet; @@ -45,9 +46,7 @@ public class UpstreamConfigSubscriber implements Subscriber { void subscribe() { subscriber = new GenericConfigSubscriber(requesterPool); - ConfigKey<?> key = config.getKey(); - handle = subscriber.subscribe(new ConfigKey<RawConfig>(key.getName(), key.getConfigId(), key.getNamespace()), - config.getDefContent(), configSourceSet, timingValues); + handle = subscriber.subscribe(config.getKey(), config.getDefContent(), configSourceSet, timingValues); } @Override |