You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2017/03/20 16:30:59 UTC
wicket git commit: WICKET-6342 Wrong baseUrl in BaseWebSocketBehavior
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 94b07c6c1 -> 25bfd3a52
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/25bfd3a5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/25bfd3a5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/25bfd3a5
Branch: refs/heads/wicket-7.x
Commit: 25bfd3a5201f4436b8747cd80ca4dc80e54c1a02
Parents: 94b07c6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Mar 20 17:30:39 2017 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Mar 20 17:30:39 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/25bfd3a5/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 fb18d5a..ee0e65b 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();
}