summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2019-05-22 14:44:16 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2019-05-22 14:44:16 +0200
commita81daa7b12a4e18284dc0e1723b97a679f0ef64c (patch)
tree8681fb6da74120501efd7e3ffac46046845bba25 /config
parentde077ac4e0f4ae933eba6118a737efee6a7724be (diff)
Correct timeLeftMillis decrementation
Diffstat (limited to 'config')
-rw-r--r--config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java2
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 b2b479e8eeb..0ca9169424c 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java
@@ -266,7 +266,7 @@ public class ConfigSubscriber {
allGenerationsChanged = allGenerationsChanged && config.isGenerationChanged();
if (config.isConfigChanged()) anyConfigChanged = true;
internalRedeployOnly = internalRedeployOnly && config.isInternalRedeploy();
- timeLeftMillis = timeLeftMillis - (System.currentTimeMillis() - started);
+ timeLeftMillis = timeoutInMillis + started - System.currentTimeMillis();
}
reconfigDue = (anyConfigChanged || !requireChange) && allGenerationsChanged && allGenerationsTheSame;
if (!reconfigDue && timeLeftMillis > 0) {