From 07b0fa132ee724920d32f0eb1108377672d444ae Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 12 Sep 2019 10:25:25 +0100 Subject: [PATCH] doFilterNestedErrorDispatch delegates to filter chain Closes: gh-23596 --- .../org/springframework/web/filter/OncePerRequestFilter.java | 2 +- .../web/filter/OncePerRequestFilterTests.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java b/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java index a08d0df4da..403e7d127b 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java @@ -247,7 +247,7 @@ public abstract class OncePerRequestFilter extends GenericFilterBean { protected void doFilterNestedErrorDispatch(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { - doFilter(request, response, filterChain); + filterChain.doFilter(request, response); } } diff --git a/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java index 9f97ca6741..3898a07846 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java @@ -16,6 +16,7 @@ package org.springframework.web.filter; import java.io.IOException; + import javax.servlet.DispatcherType; import javax.servlet.FilterChain; import javax.servlet.ServletException; @@ -31,7 +32,6 @@ import org.springframework.mock.web.test.MockHttpServletRequest; import org.springframework.mock.web.test.MockHttpServletResponse; import org.springframework.web.util.WebUtils; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -184,9 +184,10 @@ public class OncePerRequestFilterTests { @Override protected void doFilterNestedErrorDispatch(HttpServletRequest request, HttpServletResponse response, - FilterChain filterChain) { + FilterChain filterChain) throws ServletException, IOException { this.didFilterNestedErrorDispatch = true; + super.doFilterNestedErrorDispatch(request, response, filterChain); } }