1 files changed, 8 insertions, 7 deletions

diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/GenericConfigSubscriber.java b/config/src/main/java/com/yahoo/config/subscription/impl/GenericConfigSubscriber.java
index e382bab576e..6dc18137639 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/GenericConfigSubscriber.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/GenericConfigSubscriber.java
@@ -3,12 +3,14 @@ package com.yahoo.config.subscription.impl;
 
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.subscription.ConfigHandle;
+import com.yahoo.config.subscription.ConfigSourceSet;
 import com.yahoo.config.subscription.ConfigSubscriber;
 import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.vespa.config.RawConfig;
 import com.yahoo.vespa.config.TimingValues;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * A subscriber that can subscribe without the class. Used by config proxy.
@@ -17,18 +19,16 @@ import java.util.List;
  */
 public class GenericConfigSubscriber extends ConfigSubscriber {
 
-    private final JRTConfigRequester requester;
-
     /**
      * Constructs a new subscriber using the given pool of requesters (JRTConfigRequester holds 1 connection which in
      * turn is subject to failover across the elements in the source set.)
      * The behaviour is undefined if the map key is different from the source set the requester was built with.
      * See also {@link JRTConfigRequester#JRTConfigRequester(com.yahoo.vespa.config.ConnectionPool, com.yahoo.vespa.config.TimingValues)}
      *
-     * @param requester a config requester
+     * @param requesters a map from config source set to config requester
      */
-    public GenericConfigSubscriber(JRTConfigRequester requester) {
-        this.requester = requester;
+    public GenericConfigSubscriber(Map<ConfigSourceSet, JRTConfigRequester> requesters) {
+        this.requesters = requesters;
     }
 
     /**
@@ -36,12 +36,13 @@ public class GenericConfigSubscriber extends ConfigSubscriber {
      *
      * @param key the {@link ConfigKey to subscribe to}
      * @param defContent the config definition content for the config to subscribe to
+     * @param source the config source to use
      * @param timingValues {@link TimingValues}
      * @return generic handle
      */
-    public GenericConfigHandle subscribe(ConfigKey<RawConfig> key, List<String> defContent, TimingValues timingValues) {
+    public GenericConfigHandle subscribe(ConfigKey<RawConfig> key, List<String> defContent, ConfigSourceSet source, TimingValues timingValues) {
         checkStateBeforeSubscribe();
-        GenericJRTConfigSubscription sub = new GenericJRTConfigSubscription(key, defContent, requester, timingValues);
+        GenericJRTConfigSubscription sub = new GenericJRTConfigSubscription(key, defContent, this, source, timingValues);
         GenericConfigHandle handle = new GenericConfigHandle(sub);
         subscribeAndHandleErrors(sub, key, handle, timingValues);
         return handle;