1 files changed, 21 insertions, 6 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 457c15eda3d..324546230d9 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
@@ -2,33 +2,42 @@
 package com.yahoo.config.subscription.impl;
 
 import java.util.List;
+import java.util.Map;
 
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.subscription.ConfigHandle;
 import com.yahoo.config.subscription.ConfigSource;
+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;
 
 /**
- * A subscriber that can subscribe without supplying a config class. Used by config proxy.
+ * A subscriber that can subscribe without the class. Used by configproxy.
  *
  * @author Vegard Havdal
  */
 public class GenericConfigSubscriber extends ConfigSubscriber {
 
     /**
-     * Constructs a new subscriber using the given requester
+     * Constructs a new subscriber using the given pool of requesters (JRTConfigRequester holds 1 connection which in
+     * turn is subject to failover across the elems 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#get(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;
+    }
+
+    public GenericConfigSubscriber() {
+        super();
     }
 
     /**
-     * Subscribes to config without using a config class. For internal use in config proxy.
+     * Subscribes to config without using the class. For internal use in config proxy.
      *
      * @param key the {@link ConfigKey to subscribe to}
      * @param defContent the config definition content for the config to subscribe to
@@ -59,4 +68,10 @@ public class GenericConfigSubscriber extends ConfigSubscriber {
         throw new UnsupportedOperationException();
     }
 
+    /**
+     * Do nothing, since we share requesters
+     */
+    public void closeRequesters() {
+    }
+
 }