diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-12-08 16:43:15 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-12-08 16:43:15 +0100 |
| commit | a7f5024172bdb716eada086614bbccc84b7fa84c (patch) | |
| tree | e6a802b7af94e3c88d15316488646a074969a611 /config | |
| parent | 637e6d823a470eeff9b2d1f91bbb9faa11b39775 (diff) | |
Support force reget config for tests
Diffstat (limited to 'config')
| -rw-r--r-- | config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 de44d0b86c4..57dbe22a65a 100644 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java @@ -280,7 +280,7 @@ public class ConfigSubscriber implements AutoCloseable { applyOnRestartOnly |= config.applyOnRestart(); timeLeftMillis = timeoutInMillis + started - System.currentTimeMillis(); } - reconfigDue = ( initialConfiguration || (anyConfigChanged && !applyOnRestartOnly)) + reconfigDue = (initialConfiguration || !applyOnRestartOnly) && (anyConfigChanged || !requireChange) && allGenerationsChanged && allGenerationsTheSame; if (applyOnRestartOnly && ! initialConfiguration) { // disable any reconfig until restart |