summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-02-10 08:25:56 +0100
committerHarald Musum <musum@verizonmedia.com>2020-02-10 08:25:56 +0100
commit2f756dc6e2c33287d017ffdff19fe816d2b65516 (patch)
treeb2b08519f39eff187ab3d214dde0d1664f3694dd
parentc28a74566fa17b804e23966fe3189987735d4973 (diff)
Inline some stuff
-rw-r--r--config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java22
1 files changed, 10 insertions, 12 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 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);
}