Revert "Jonmv/reapply application name validation"

2 files changed, 10 insertions, 5 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 7e6fccb6d2f..d3976464bde 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,9 +193,10 @@ public class DelayedConfigResponses {
     }
 
     private synchronized void metricDelayedResponses(ApplicationId app, int elems) {
-        metrics.computeIfAbsent(app, key -> rpcServer.metricUpdaterFactory()
-                                                     .getOrCreateMetricUpdater(Metrics.createDimensions(key)))
-               .setDelayedResponses(elems);
+        if ( ! metrics.containsKey(app)) {
+            metrics.put(app, rpcServer.metricUpdaterFactory().getOrCreateMetricUpdater(Metrics.createDimensions(app)));
+        }
+        metrics.get(app).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 ebf1fb32141..99ffff6403b 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,9 +243,13 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
     }
 
     private ApplicationState getState(ApplicationId id) {
-        return applicationStateMap.computeIfAbsent(id, __ -> new ApplicationState(0));
+        ApplicationState state = applicationStateMap.get(id);
+        if (state == null) {
+            applicationStateMap.putIfAbsent(id, new ApplicationState(0));
+            state = applicationStateMap.get(id);
+        }
+        return state;
     }
-
     boolean hasNewerGeneration(ApplicationId id, long generation) {
         return getState(id).getActiveGeneration() > generation;
     }