diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-05-22 14:44:37 +0200 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-05-22 14:44:37 +0200 |
commit | f96377b40ac7afeab525da1af3356e6b2f3ed9d6 (patch) | |
tree | 2f08f8988f91f1fa4973cd33bcb0263df28a5768 /config | |
parent | a81daa7b12a4e18284dc0e1723b97a679f0ef64c (diff) |
Improve readability and correct a comment
Diffstat (limited to 'config')
-rw-r--r-- | config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java | 8 | ||||
-rw-r--r-- | config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java | 2 |
2 files changed, 5 insertions, 5 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 0ca9169424c..83dc041ad4a 100644 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java @@ -262,10 +262,10 @@ public class ConfigSubscriber { throwIfExceptionSet(subscription); ConfigSubscription.ConfigState<? extends ConfigInstance> config = subscription.getConfigState(); if (currentGen == null) currentGen = config.getGeneration(); - if ( ! currentGen.equals(config.getGeneration())) allGenerationsTheSame = false; - allGenerationsChanged = allGenerationsChanged && config.isGenerationChanged(); - if (config.isConfigChanged()) anyConfigChanged = true; - internalRedeployOnly = internalRedeployOnly && config.isInternalRedeploy(); + allGenerationsTheSame &= currentGen.equals(config.getGeneration()); + allGenerationsChanged &= config.isGenerationChanged(); + anyConfigChanged |= config.isConfigChanged(); + internalRedeployOnly &= config.isInternalRedeploy(); timeLeftMillis = timeoutInMillis + started - System.currentTimeMillis(); } reconfigDue = (anyConfigChanged || !requireChange) && allGenerationsChanged && allGenerationsTheSame; diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java index faaf87d9732..e0d4e6e6390 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java @@ -185,7 +185,7 @@ public abstract class ConfigSubscription<T extends ConfigInstance> { this.config.set(new ConfigState<>(true, generation, internalRedeploy, true, config)); } - // Only used by {@link FileConfigSubscription} + /** Used by {@link FileConfigSubscription} and {@link ConfigSetSubscription} */ protected void setConfigIncGen(T config) { ConfigState<T> prev = this.config.get(); this.config.set(new ConfigState<>(true, prev.getGeneration() + 1, prev.isInternalRedeploy(), true, config)); |