jetty 12.0.x error unwrap servlet exception (#8491)

* unwrap servlet exception per default as expected by TCK Signed-off-by: Olivier Lamy <[email protected]>
jetty · Sep 3, 2022 · 0acd7df · 0acd7df
1 parent 314c802
commit 0acd7df
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/...etty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ErrorPageErrorHandler.java b/...etty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ErrorPageErrorHandler.java
@@ -39,7 +39,7 @@ private enum PageLookupTechnique
 
     private final Map<String, String> _errorPages = new HashMap<>(); // code or exception to URL
     private final List<ErrorCodeRange> _errorPageList = new ArrayList<>(); // list of ErrorCode by range
-    private boolean _unwrapServletException = false;
+    private boolean _unwrapServletException = true;
 
     /**
      * @return True if ServletException is unwrapped for {@link Dispatcher#ERROR_EXCEPTION}

diff --git a/...e10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/AsyncContextTest.java b/...e10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/AsyncContextTest.java
@@ -87,6 +87,7 @@ public void setUp() throws Exception
         _contextHandler.addServlet(new ServletHolder(new ErrorServlet()), "/error/*");
 
         ErrorPageErrorHandler errorHandler = new ErrorPageErrorHandler();
+        errorHandler.setUnwrapServletException(false);
         _contextHandler.setErrorProcessor(errorHandler);
         errorHandler.addErrorPage(500, "/error/500");
         errorHandler.addErrorPage(IOException.class.getName(), "/error/IOE");

diff --git a/.../jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ErrorPageErrorHandler.java b/.../jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ErrorPageErrorHandler.java
@@ -44,7 +44,7 @@ private enum PageLookupTechnique
     private final Map<String, String> _errorPages = new HashMap<>(); // code or exception to URL
     private final List<ErrorCodeRange> _errorPageList = new ArrayList<>(); // list of ErrorCode by range
     protected ServletContext _servletContext;
-    private boolean _unwrapServletException = false;
+    private boolean _unwrapServletException = true;
 
     /**
      * @return True if ServletException is unwrapped for {@link Dispatcher#ERROR_EXCEPTION}