(tomcat) 01/02: Fix backport

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 4968ba7ac49f69e10ba1e2f092458608e1545672
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 21 16:43:41 2025 +0100

    Fix backport
---
 java/org/apache/catalina/core/ApplicationFilterChain.java | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java 
b/java/org/apache/catalina/core/ApplicationFilterChain.java
index aac12f76ed..36b89d81e7 100644
--- a/java/org/apache/catalina/core/ApplicationFilterChain.java
+++ b/java/org/apache/catalina/core/ApplicationFilterChain.java
@@ -166,8 +166,8 @@ public final class ApplicationFilterChain implements 
FilterChain {
             } catch (IOException | ServletException | RuntimeException e) {
                 throw e;
             } catch (Throwable t) {
-                e = ExceptionUtils.unwrapInvocationTargetException(t);
-                ExceptionUtils.handleThrowable(e);
+                t = ExceptionUtils.unwrapInvocationTargetException(t);
+                ExceptionUtils.handleThrowable(t);
                 throw new ServletException(sm.getString("filterChain.filter"), 
t);
             }
             return;
@@ -196,16 +196,10 @@ public final class ApplicationFilterChain implements 
FilterChain {
             }
         } catch (IOException | ServletException | RuntimeException e) {
             throw e;
-<<<<<<< HEAD
-        } catch (Throwable e) {
-            e = ExceptionUtils.unwrapInvocationTargetException(e);
-            ExceptionUtils.handleThrowable(e);
-            throw new ServletException(sm.getString("filterChain.servlet"), e);
-=======
         } catch (Throwable t) {
+            t = ExceptionUtils.unwrapInvocationTargetException(t);
             ExceptionUtils.handleThrowable(t);
             throw new ServletException(sm.getString("filterChain.servlet"), t);
->>>>>>> 99ceef12d3 (Code clean-up - no functional change. Use 't' for 
throwable)
         } finally {
             if (dispatcherWrapsSameObject) {
                 lastServicedRequest.set(null);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org