diff options
author | Harald Musum <musum@yahooinc.com> | 2023-02-28 10:28:29 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-02-28 10:28:29 +0100 |
commit | 453342085e6fb785971e3e35f2466bf8b4061adf (patch) | |
tree | 0bb6e26a306b0ee33df5ea512b2eefe71abd5bc1 | |
parent | a75326292b6486d42a47a6a2bd6d3dffb314bacd (diff) |
Add empty() method to GetConfigContext
3 files changed, 8 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigContext.java b/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigContext.java index a614e251dca..89f7755729c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigContext.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigContext.java @@ -38,9 +38,15 @@ public class GetConfigContext { return new GetConfigContext(app, handler, trace); } + public static GetConfigContext empty() { + return new GetConfigContext(null, null, null); + } + public static GetConfigContext testContext(ApplicationId app) { return new GetConfigContext(app, null, null); } + + public boolean isEmpty() { return app == null && requestHandler == null && trace == null; } /** * Helper to produce a log preamble with the tenant and app id diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java index 1c419ce047a..6aafe5e0261 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java @@ -96,7 +96,7 @@ class GetConfigProcessor implements Runnable { } GetConfigContext context = rpcServer.createGetConfigContext(tenant, request, trace); - if (context == null || ! context.requestHandler().hasApplication(context.applicationId(), Optional.empty())) { + if (context.isEmpty() || ! context.requestHandler().hasApplication(context.applicationId(), Optional.empty())) { handleError(request, APPLICATION_NOT_LOADED, "No application exists"); return null; } 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 2d731370b70..7a1b2d2aeef 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 @@ -406,7 +406,7 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList metrics.incUnknownHostRequests(); trace.trace(TRACELEVEL, msg); log.log(Level.WARNING, msg); - return null; + return GetConfigContext.empty(); } RequestHandler handler = requestHandler.get(); ApplicationId applicationId = handler.resolveApplicationId(request.getClientHostName()); |