Revert "Merge pull request #21961 from vespa-engine/revert-21918-jonmv/misc-6"

This reverts commit a0b02d8bd00bf8d7f3410cbf47ae432770546883, reversing
changes made to 64d0102f9931a01d31976e85b585b9e63894f08e.

2 files changed, 5 insertions, 10 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
index d3976464bde..7e6fccb6d2f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
@@ -193,10 +193,9 @@ public class DelayedConfigResponses {
     }
 
     private synchronized void metricDelayedResponses(ApplicationId app, int elems) {
-        if ( ! metrics.containsKey(app)) {
-            metrics.put(app, rpcServer.metricUpdaterFactory().getOrCreateMetricUpdater(Metrics.createDimensions(app)));
-        }
-        metrics.get(app).setDelayedResponses(elems);
+        metrics.computeIfAbsent(app, key -> rpcServer.metricUpdaterFactory()
+                                                     .getOrCreateMetricUpdater(Metrics.createDimensions(key)))
+               .setDelayedResponses(elems);
     }
 
     private synchronized void createQueueIfNotExists(GetConfigContext context) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
index 99ffff6403b..ebf1fb32141 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
@@ -243,13 +243,9 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
     }
 
     private ApplicationState getState(ApplicationId id) {
-        ApplicationState state = applicationStateMap.get(id);
-        if (state == null) {
-            applicationStateMap.putIfAbsent(id, new ApplicationState(0));
-            state = applicationStateMap.get(id);
-        }
-        return state;
+        return applicationStateMap.computeIfAbsent(id, __ -> new ApplicationState(0));
     }
+
     boolean hasNewerGeneration(ApplicationId id, long generation) {
         return getState(id).getActiveGeneration() > generation;
     }