diff options
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpErrorResponse.java | 2 | ||||
| -rw-r--r-- | container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpErrorResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpErrorResponse.java index 3961fe12357..bd4231972e7 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpErrorResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpErrorResponse.java @@ -110,7 +110,7 @@ public class HttpErrorResponse extends HttpResponse { new JsonFormat(true).encode(stream, slime); } - //@Override + @Override public String getContentType() { return HttpConfigResponse.JSON_CONTENT_TYPE; } diff --git a/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java b/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java index 8ba94f9aca9..71fde8a9dbf 100644 --- a/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java +++ b/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java @@ -151,10 +151,11 @@ class RestApiImpl implements RestApi { private static List<ExceptionMapperHolder<?>> combineWithDefaultExceptionMappers( List<ExceptionMapperHolder<?>> configuredExceptionMappers, boolean disableDefaultMappers) { - List<ExceptionMapperHolder<?>> exceptionMappers = new ArrayList<>(configuredExceptionMappers); + List<ExceptionMapperHolder<?>> exceptionMappers = new ArrayList<>(); if (!disableDefaultMappers){ exceptionMappers.add(new ExceptionMapperHolder<>(RestApiException.class, (context, exception) -> exception.response())); } + exceptionMappers.addAll(configuredExceptionMappers); return exceptionMappers; } |