Repository: wicket Updated Branches: refs/heads/wicket-6.x 7b2fd15f8 -> eff2b2509
improve readability with true compare statement Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/eff2b250 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/eff2b250 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/eff2b250 Branch: refs/heads/wicket-6.x Commit: eff2b2509cea3673a3465c75e0c07ee3e421399b Parents: 7b2fd15 Author: Sven Meier <[email protected]> Authored: Thu May 21 16:13:28 2015 +0200 Committer: Sven Meier <[email protected]> Committed: Thu May 21 16:13:28 2015 +0200 ---------------------------------------------------------------------- .../apache/wicket/protocol/ws/AbstractUpgradeFilter.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/eff2b250/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java ---------------------------------------------------------------------- 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 489b10d..0d2b4a6 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 @@ -56,7 +56,11 @@ public class AbstractUpgradeFilter extends WicketFilter { res = true; } - else if (!requestCycle.processRequestAndDetach() && !httpServletResponse.isCommitted()) + else if (requestCycle.processRequestAndDetach() || httpServletResponse.isCommitted()) + { + webResponse.flush(); + } + else { if (chain != null) { @@ -64,10 +68,6 @@ public class AbstractUpgradeFilter extends WicketFilter } res = false; } - else - { - webResponse.flush(); - } return res; }
