Test no config when restart on redeploy

3 files changed, 7 insertions, 5 deletions

diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java
index 886d8994d15..d0eda9d27cc 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java
@@ -3,9 +3,8 @@ package com.yahoo.config.subscription;
 
 /**
  * A type of source of config
- * @author vegardh
- * @since 5.1
  *
+ * @author vegardh
  */
 public interface ConfigSource {
 
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java
index bb8d5a87916..c799186435c 100755
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java
@@ -14,10 +14,10 @@ import java.util.logging.Logger;
  * Two sets are said to be equal if they contain the same sources, independent of order,
  * upper/lower-casing and whitespaces.
  *
- * @author <a href="gv@yahoo-inc.com">G. Voldengen</a>
+ * @author gjoranv
  */
-public class ConfigSourceSet implements ConfigSource
-{
+public class ConfigSourceSet implements ConfigSource {
+
     private static final Logger log = Logger.getLogger(ConfigSourceSet.class.getName());
     private final Set<String> sources = new LinkedHashSet<>();
 
@@ -124,4 +124,5 @@ public class ConfigSourceSet implements ConfigSource
         }
         return sourceSet;
     }
+
 }
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java
index 9e3a08eaf2c..80b76e7c919 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java
@@ -221,6 +221,7 @@ public class ConfigSubscriber {
 
     /**
      * Acquire a snapshot of all configs with the same generation within a timeout.
+     *
      * @param timeoutInMillis timeout to wait in milliseconds
      * @param requireChange if set, at least one config have to change
      * @return true, if a new config generation has been found for all configs (additionally requires
@@ -250,6 +251,7 @@ public class ConfigSubscriber {
                 }
                 throwIfExceptionSet(subscription);
                 ConfigSubscription.ConfigState<? extends ConfigInstance> config = subscription.getConfigState();
+                System.out.println("Subscription " + subscription + " of class " + subscription.getClass());
                 if (currentGen == null) currentGen = config.getGeneration();
                 if ( ! currentGen.equals(config.getGeneration())) allGenerationsTheSame = false;
                 allGenerationsChanged = allGenerationsChanged && config.isGenerationChanged();