From 5aef2726baf388ccd03e811800ba88ffbab86f8d Mon Sep 17 00:00:00 2001
From: Jon Marius Venstad <venstad@gmail.com>
Date: Fri, 30 Apr 2021 16:46:13 +0200
Subject: Check built-in response exceptions first

---
 container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'container-core/src/main/java/com/yahoo/restapi')

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;
     }
 
-- 
cgit v1.2.3