From c056f5c47450bcf4e60ef93387360dd2c9f89791 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Wed, 21 Oct 2020 14:02:20 +0200
Subject: Revert "Add suffix in thread name. Combine return statement +
 assignment."

This reverts commit e3fa0cbeb1d47f7ac2dcb4dcf98d021fc354e935.
---
 .../com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'jdisc_http_service')

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java
index 1a24521e10c..5a273548794 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java
@@ -53,7 +53,7 @@ class HealthCheckProxyHandler extends HandlerWrapper {
 
     private static final String HEALTH_CHECK_PATH = "/status.html";
 
-    private final Executor executor = Executors.newSingleThreadExecutor(new DaemonThreadFactory("health-check-proxy-client-"));
+    private final Executor executor = Executors.newSingleThreadExecutor(new DaemonThreadFactory("health-check-proxy-client"));
     private final Map<Integer, ProxyTarget> portToProxyTargetMapping;
 
     HealthCheckProxyHandler(List<JDiscServerConnector> connectors) {
@@ -174,7 +174,9 @@ class HealthCheckProxyHandler extends HandlerWrapper {
             if (response != null && !response.isExpired()) {
                 return response;
             }
-            return this.lastResponse = getStatusResponse();
+            StatusResponse statusResponse = getStatusResponse();
+            lastResponse = statusResponse;
+            return statusResponse;
         }
 
         private StatusResponse getStatusResponse() {
-- 
cgit v1.2.3