rename of method

Signed-off-by: Olivier Lamy <olamy@apache.org>
jetty · Jan 27, 2023 · 3643858 · 3643858
1 parent 1d2d192
commit 3643858
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 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
@@ -93,7 +93,7 @@ public String getErrorPage(HttpServletRequest request)
 
         if (error instanceof ServletException && _unwrapServletException)
         {
-            Throwable unwrapped = getFirstNonServletException(error, matchedThrowable);
+            Throwable unwrapped = unwrapServletException(error, matchedThrowable);
             if (unwrapped != null)
             {
                 request.setAttribute(Dispatcher.ERROR_EXCEPTION, unwrapped);
@@ -178,13 +178,13 @@ public String getErrorPage(HttpServletRequest request)
      * @param matchedThrowable the class we found matching the error page (can be null)
      * @return the first non {@link ServletException} from root cause chain
      */
-    private Throwable getFirstNonServletException(Throwable t, Class<?> matchedThrowable)
+    private Throwable unwrapServletException(Throwable t, Class<?> matchedThrowable)
     {
         if (matchedThrowable != null && t.getClass() == matchedThrowable)
             return t;
         if (t instanceof ServletException && t.getCause() != null)
         {
-            return getFirstNonServletException(t.getCause(), matchedThrowable);
+            return unwrapServletException(t.getCause(), matchedThrowable);
         }
         return t;
     }

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
@@ -98,7 +98,7 @@ public String getErrorPage(HttpServletRequest request)
 
         if (error instanceof ServletException && _unwrapServletException)
         {
-            Throwable unwrapped = getFirstNonServletException(error, matchedThrowable);
+            Throwable unwrapped = unwrapServletException(error, matchedThrowable);
             if (unwrapped != null)
             {
                 request.setAttribute(Dispatcher.ERROR_EXCEPTION, unwrapped);
@@ -183,13 +183,13 @@ public String getErrorPage(HttpServletRequest request)
      * @param matchedThrowable the class we found matching the error page (can be null)
      * @return the first non {@link ServletException} from root cause chain
      */
-    private Throwable getFirstNonServletException(Throwable t, Class<?> matchedThrowable)
+    private Throwable unwrapServletException(Throwable t, Class<?> matchedThrowable)
     {
         if (matchedThrowable != null && t.getClass() == matchedThrowable)
             return t;
         if (t instanceof ServletException && t.getCause() != null)
         {
-            return getFirstNonServletException(t.getCause(), matchedThrowable);
+            return unwrapServletException(t.getCause(), matchedThrowable);
         }
         return t;
     }