You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by so...@apache.org on 2017/10/03 12:37:30 UTC
[4/5] wicket git commit: [WICKET-6476] check is added while setting
filter path to prevent exception
[WICKET-6476] check is added while setting filter path to prevent exception
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/58a7106d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/58a7106d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/58a7106d
Branch: refs/heads/WICKET-6105-java.time
Commit: 58a7106d74de02cc9f193d95613b6c1f3483ca7b
Parents: 05aa3e8
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Oct 3 11:46:28 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Oct 3 11:46:28 2017 +0700
----------------------------------------------------------------------
.../wicket/protocol/ws/util/tester/WebSocketTester.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/58a7106d/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java
index 69aa114..f45c826 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java
@@ -51,7 +51,10 @@ public class WebSocketTester
Args.notNull(page, "page");
WebApplication webApplication = wicketTester.getApplication();
- webApplication.getWicketFilter().setFilterPath("");
+ if (webApplication.getWicketFilter().getFilterPath() == null)
+ {
+ webApplication.getWicketFilter().setFilterPath("");
+ }
socketProcessor = new TestWebSocketProcessor(wicketTester, page)
{
@@ -85,7 +88,10 @@ public class WebSocketTester
Args.notNull(resourceName, "resourceName");
WebApplication webApplication = wicketTester.getApplication();
- webApplication.getWicketFilter().setFilterPath("");
+ if (webApplication.getWicketFilter().getFilterPath() == null)
+ {
+ webApplication.getWicketFilter().setFilterPath("");
+ }
socketProcessor = new TestWebSocketProcessor(wicketTester, resourceName)
{