diff options
author | Harald Musum <musum@oath.com> | 2017-09-04 11:10:57 +0200 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2017-09-04 11:10:57 +0200 |
commit | a1f6d45301cc38535b6f4d380c8cf9e0f7c6b704 (patch) | |
tree | 8063877b528cdfcba0563502b0beb83f3ec641dd | |
parent | 161f68ecc92beeb918d637061f247659a1865a96 (diff) |
Catch Error and log at a place where thread will otherwise die silently
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java | 2 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java b/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java index 272569fde20..f71e6d1e70f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java @@ -61,7 +61,7 @@ class InstanceResolver { if (targetDef != null) applyDef(builder, targetDef); Class<? extends ConfigInstance> clazz = getConfigClass(defKey, builder.getClass().getClassLoader()); return clazz.getConstructor(builder.getClass()).newInstance(builder); - } catch (Throwable e) { // We might get an Error here if there are class loading issues, so catch Throwable + } catch (Exception e) { throw new ConfigurationRuntimeException(e); } } 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 37f8aa4ea40..4018d69d047 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 @@ -112,7 +112,7 @@ class GetConfigProcessor implements Runnable { } catch (UnknownConfigIdException e) { handleError(request, ErrorCode.ILLEGAL_CONFIGID, "Illegal config id " + request.getConfigKey().getConfigId()); return; - } catch (Exception e) { + } catch (Exception | Error e) { log.log(Level.SEVERE, "Unexpected error handling config request", e); handleError(request, ErrorCode.INTERNAL_ERROR, "Internal error " + e.getMessage()); return; |