This is an automated email from the ASF dual-hosted git repository.
svenmeier pushed a commit to branch wicket-6831
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/wicket-6831 by this push:
new ca144a7 WICKET-6831 remove duplicate code
ca144a7 is described below
commit ca144a7214e79df32649d2da4f54da7581ecff2a
Author: Sven Meier <[email protected]>
AuthorDate: Wed Sep 23 16:18:34 2020 +0200
WICKET-6831 remove duplicate code
---
.../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 ef90b10..35c456c 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
@@ -270,9 +270,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();
@@ -293,9 +291,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 4b596ab..fd3c45e 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
@@ -58,43 +58,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)
