WICKET-6342 Wrong baseUrl in BaseWebSocketBehavior
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f39b40da Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f39b40da Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f39b40da Branch: refs/heads/master Commit: f39b40dabe0ca11ddc5b96923bd6920403e8471e Parents: 89e509f Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Mar 20 17:30:39 2017 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Mar 20 21:42:32 2017 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/f39b40da/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java index a95f80c..dd28e98 100644 --- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java +++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java @@ -305,7 +305,7 @@ public class WebSocketSettings if (baseUrl.get() == null) { Url _baseUrl = RequestCycle.get().getUrlRenderer().getBaseUrl(); - baseUrl.compareAndSet(null, Strings.escapeMarkup(_baseUrl.toString())); + return Strings.escapeMarkup(_baseUrl.toString()); } return baseUrl.get(); }
