Merge pull request #9635 from vespa-engine/bjorncs/configserver-rpc-authz-fix

Fix logic for unknown hosts

1 files changed, 2 insertions, 2 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 f9361b43045..b7bc70ff648 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
@@ -112,10 +112,10 @@ public class MultiTenantRpcAuthorizer implements RpcAuthorizer {
                 } else {
                     String hostname = configRequest.getClientHostName();
                     Optional<RequestHandler> tenantHandler =
-                            Optional.of(hostRegistry.getKeyForHost(hostname))
+                            Optional.ofNullable(hostRegistry.getKeyForHost(hostname))
                                     .flatMap(this::getTenantHandler);
                     if (tenantHandler.isEmpty()) {
-                        return; // unknown tenant
+                        return; // unknown host
                     }
                     ApplicationId resolvedApplication = tenantHandler.get().resolveApplicationId(hostname);
                     ApplicationId peerOwner = applicationId(peerIdentity);