Repository: wicket Updated Branches: refs/heads/master 1421ea2dc -> b41a682f4
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/b41a682f Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b41a682f Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b41a682f Branch: refs/heads/master Commit: b41a682f4c03392b6270efcf1be23fc1e64cfdfa Parents: 1421ea2 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 17:31:12 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/b41a682f/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(); }
