From 5420887441026dde56dbac3a94e71e41df0c25e5 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahooinc.com>
Date: Thu, 14 Oct 2021 17:33:11 +0200
Subject: Remove dead code

---
 .../java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java | 9 ++++-----
 config/src/main/java/com/yahoo/vespa/config/TimingValues.java    | 7 -------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
index 2e8685887c6..5df7b1fc021 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
@@ -258,11 +258,10 @@ class RpcConfigSourceClient implements ConfigSourceClient, Runnable {
     private static TimingValues createTimingValues() {
         // Proxy should time out before clients upon subscription.
         double timingValuesRatio = 0.8;
-        TimingValues tv = new TimingValues();
-        tv.setFixedDelay((long) (tv.getFixedDelay() * timingValuesRatio)).
-                  setSubscribeTimeout((long) (tv.getSubscribeTimeout() * timingValuesRatio)).
-                  setConfiguredErrorTimeout(-1);  // Never cache errors
-        return tv;
+
+        return new TimingValues()
+                .setFixedDelay((long) (new TimingValues().getFixedDelay() * timingValuesRatio))
+                .setSubscribeTimeout((long) (new TimingValues().getSubscribeTimeout() * timingValuesRatio));
     }
 
 }
diff --git a/config/src/main/java/com/yahoo/vespa/config/TimingValues.java b/config/src/main/java/com/yahoo/vespa/config/TimingValues.java
index 56f85845aa0..f19be768811 100644
--- a/config/src/main/java/com/yahoo/vespa/config/TimingValues.java
+++ b/config/src/main/java/com/yahoo/vespa/config/TimingValues.java
@@ -16,7 +16,6 @@ public class TimingValues {
     private final long errorTimeout;
     private final long initialTimeout;
     private long subscribeTimeout = 55000;
-    private long configuredErrorTimeout = -1;  // Don't ever timeout (and do not use error response) when we are already configured
 
     private long fixedDelay = 5000;
     private final Random rand;
@@ -97,11 +96,6 @@ public class TimingValues {
         return this;
     }
 
-    public TimingValues setConfiguredErrorTimeout(long t) {
-        configuredErrorTimeout = t;
-        return this;
-    }
-
     /**
      * Returns fixed delay that is used when retrying getting config no matter if it was a success or an error
      * and independent of number of retries.
@@ -134,7 +128,6 @@ public class TimingValues {
                + ", errorTimeout=" + errorTimeout
                + ", initialTimeout=" + initialTimeout
                + ", subscribeTimeout=" + subscribeTimeout
-               + ", configuredErrorTimeout=" + configuredErrorTimeout
                + ", fixedDelay=" + fixedDelay
                + ", rand=" + rand + "]";
     }
-- 
cgit v1.2.3