summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-02-06 13:12:02 +0100
committerHarald Musum <musum@verizonmedia.com>2020-02-06 13:12:02 +0100
commit05e48ae30e5231c8c23f2e3a7e1775242aca485c (patch)
tree9b9551cd7a53b9ccb8430bb8068d5b1b5706755b /config
parent59801d88c4c39b79dc016fe94a2390a3d4b573b4 (diff)
Always set new config (which also sets generation) when generation has changed
Diffstat (limited to 'config')
-rw-r--r--config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
index 8327f1c1351..9c40d0605bd 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
@@ -92,11 +92,7 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
}
if (jrtReq.hasUpdatedGeneration()) {
setInternalRedeploy(jrtReq.responseIsInternalRedeploy());
- if (jrtReq.hasUpdatedConfig()) {
- setNewConfig(jrtReq);
- } else {
- setGeneration(jrtReq.getNewGeneration());
- }
+ setNewConfig(jrtReq);
}
return true;
}