Call getPeerIdentity() from inside try-catch block

1 files changed, 8 insertions, 8 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java
index bed9ca3eba3..9e015e73dde 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java
@@ -84,14 +84,14 @@ public class MultiTenantRpcAuthorizer implements RpcAuthorizer {
 
     private CompletableFuture<Void> doAsyncAuthorization(Request request, BiConsumer<Request, NodeIdentity> authorizer) {
         return CompletableFuture.runAsync(
-                () -> getPeerIdentity(request)
-                        .ifPresent(peerIdentity -> {
-                            try {
-                                authorizer.accept(request, peerIdentity);
-                            } catch (Throwable t) {
-                                handleAuthorizationFailure(request, t);
-                            }
-                        }),
+                () -> {
+                    try {
+                        getPeerIdentity(request)
+                                .ifPresent(peerIdentity -> authorizer.accept(request, peerIdentity));
+                    } catch (Throwable t) {
+                        handleAuthorizationFailure(request, t);
+                    }
+                },
                 executor);
     }