From 2f756dc6e2c33287d017ffdff19fe816d2b65516 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Mon, 10 Feb 2020 08:25:56 +0100
Subject: Inline some stuff

---
 .../config/protocol/JRTClientConfigRequestV3.java  | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'config/src')

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 b3ca7355023..846db94119a 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
@@ -109,19 +109,17 @@ public class JRTClientConfigRequestV3 implements JRTClientConfigRequest {
                                                                                   Trace trace,
                                                                                   CompressionType compressionType,
                                                                                   Optional<VespaVersion> vespaVersion) {
-        String hostname = ConfigUtils.getCanonicalHostName();
-        ConfigKey<T> key = sub.getKey();
         ConfigSubscription.ConfigState<T> configState = sub.getConfigState();
-        T i = configState.getConfig();
-        return createWithParams(key,
-                sub.getDefContent(),
-                hostname,
-                i != null ? i.getConfigMd5() : "",
-                configState.getGeneration() != null ? configState.getGeneration() : 0L,
-                sub.timingValues().getSubscribeTimeout(),
-                trace,
-                compressionType,
-                vespaVersion);
+        T config = configState.getConfig();
+        return createWithParams(sub.getKey(),
+                                sub.getDefContent(),
+                                ConfigUtils.getCanonicalHostName(),
+                                config != null ? config.getConfigMd5() : "",
+                                configState.getGeneration() != null ? configState.getGeneration() : 0L,
+                                sub.timingValues().getSubscribeTimeout(),
+                                trace,
+                                compressionType,
+                                vespaVersion);
     }
 
 
-- 
cgit v1.2.3


From 4cdb4b0f3be0627353247517bbfc48dcd206401c Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Mon, 10 Feb 2020 09:42:33 +0100
Subject: Config generation is never null

---
 .../com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'config/src')

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,
-- 
cgit v1.2.3