Repository: wicket Updated Branches: refs/heads/wicket-7.x a1f984def -> 97daad6ab
[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/97daad6a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/97daad6a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/97daad6a Branch: refs/heads/wicket-7.x Commit: 97daad6ab085c8da2cf90cdfd3478c55e4e8e861 Parents: a1f984d Author: Maxim Solodovnik <[email protected]> Authored: Tue Oct 3 11:46:28 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Oct 3 17:15:41 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/97daad6a/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) {
