diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-10-27 09:34:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-27 09:34:10 +0200 |
| commit | 1b15163ee4186abf57729a07c8946415bc0086d4 (patch) | |
| tree | 99716abfb9d245014d3498f81448a0ee5f180ccc /configserver | |
| parent | 4ca182712758f3db0422050f83a270d84997ae42 (diff) | |
| parent | 85f87894ec1b476cb8ef558b68c17b70172c50ba (diff) | |
Merge pull request #24607 from vespa-engine/bratseth/illegal-argument-exception
Use IllegalArgumentException when appropriate
Diffstat (limited to 'configserver')
2 files changed, 4 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java index 0b409d38196..5ceeb83d2d3 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java @@ -157,8 +157,8 @@ public class Application implements ModelResult { // This can happen in cases where services ask for config that no longer exist before they have been able // to reconfigure themselves log.log(Level.INFO, TenantRepository.logPre(getId()) + - ": Error resolving instance for builder '" + cacheBuilderClassNameForErrorReport + - "', returning empty config: " + Exceptions.toMessageString(e)); + ": Error resolving instance for builder '" + cacheBuilderClassNameForErrorReport + + "', returning empty config: " + Exceptions.toMessageString(e)); payload = ConfigPayload.fromBuilder(new ConfigPayloadBuilder()); } if (def.getCNode() != null) diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigInstanceBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigInstanceBuilder.java index 1167f32caf5..d99d9a7e017 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigInstanceBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigInstanceBuilder.java @@ -109,7 +109,8 @@ class ConfigInstanceBuilder { private static Class<? extends ConfigInstance> getConfigClass(Class<? extends ConfigInstance.Builder> builderClass) { Class<?> configClass = builderClass.getEnclosingClass(); if (configClass == null || ! ConfigInstance.class.isAssignableFrom(configClass)) { - throw new ConfigurationRuntimeException("Builder class " + builderClass + " has enclosing class " + configClass + ", which is not a ConfigInstance"); + throw new ConfigurationRuntimeException("Builder class " + builderClass + " has enclosing class " + + configClass + ", which is not a ConfigInstance"); } return (Class<? extends ConfigInstance>) configClass; } |