diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-02-10 09:42:33 +0100 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2020-02-10 09:42:33 +0100 |
| commit | 4cdb4b0f3be0627353247517bbfc48dcd206401c (patch) | |
| tree | f6765fe4140ba78697dee707e10b412e030e2b83 | |
| parent | 2f756dc6e2c33287d017ffdff19fe816d2b65516 (diff) | |
Config generation is never null
| -rw-r--r-- | config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java index 846db94119a..12e5968ab83 100644 --- a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java +++ b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java @@ -115,14 +115,13 @@ public class JRTClientConfigRequestV3 implements JRTClientConfigRequest { sub.getDefContent(), ConfigUtils.getCanonicalHostName(), config != null ? config.getConfigMd5() : "", - configState.getGeneration() != null ? configState.getGeneration() : 0L, + configState.getGeneration(), sub.timingValues().getSubscribeTimeout(), trace, compressionType, vespaVersion); } - public static JRTClientConfigRequest createFromRaw(RawConfig config, long serverTimeout, Trace trace, @@ -140,7 +139,6 @@ public class JRTClientConfigRequestV3 implements JRTClientConfigRequest { vespaVersion); } - public static JRTClientConfigRequest createWithParams(ConfigKey<?> reqKey, DefContent defContent, String hostname, |