This is an automated email from the ASF dual-hosted git repository. papegaaij pushed a commit to branch wicket-6831-w8 in repository https://gitbox.apache.org/repos/asf/wicket.git
commit bed559fdf531b15dab3ae0367873f2e27b2fcdcc Author: Sven Meier <[email protected]> AuthorDate: Wed Sep 23 16:18:34 2020 +0200 WICKET-6831 remove duplicate code (cherry picked from commit ca144a7214e79df32649d2da4f54da7581ecff2a) --- .../apache/wicket/protocol/http/WicketFilter.java | 7 ++--- .../wicket/protocol/ws/AbstractUpgradeFilter.java | 36 ++-------------------- 2 files changed, 5 insertions(+), 38 deletions(-) diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java index 3742073..c53d0cd 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java @@ -269,9 +269,7 @@ public class WicketFilter implements Filter HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, final FilterChain chain) throws IOException, ServletException { - // Assume we are able to handle the request - boolean res = true; - boolean reqProcessed = false; + boolean reqProcessed; try { reqProcessed = requestCycle.processRequest(); @@ -292,9 +290,8 @@ public class WicketFilter implements Filter // invoke next filter from within Wicket context chain.doFilter(httpServletRequest, httpServletResponse); } - res = false; } - return res; + return reqProcessed; } /** diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java index 194e63f..582fcb1 100644 --- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java +++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java @@ -57,43 +57,13 @@ public class AbstractUpgradeFilter extends WicketFilter final FilterChain chain) throws IOException, ServletException { - // Assume we are able to handle the request - boolean res = true; - ThreadContext.setRequestCycle(requestCycle); - if (acceptWebSocket(httpServletRequest, httpServletResponse) || httpServletResponse.isCommitted()) { - res = true; + return true; } - else - { - boolean reqProcessed = false; - try - { - reqProcessed = requestCycle.processRequest() || httpServletResponse.isCommitted(); - if (reqProcessed) - { - webResponse.flush(); - } - } - finally - { - requestCycle.detach(); - } - - if (!reqProcessed) - { - if (chain != null) - { - // invoke next filter from within Wicket context - chain.doFilter(httpServletRequest, httpServletResponse); - } - res = false; - } - } - - return res; + + return super.processRequestCycle(requestCycle, webResponse, httpServletRequest, httpServletResponse, chain); } protected boolean acceptWebSocket(HttpServletRequest req, HttpServletResponse resp)
