Repository: wicket Updated Branches: refs/heads/master 515e2be2a -> a06d33178
WICKET-6091 NPE in RequestLoggerRequestCycleListener when using native-websockets Use the upgrade request's uri as url Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a06d3317 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a06d3317 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a06d3317 Branch: refs/heads/master Commit: a06d33178857561d83e7d4b4b573f2bf7189a120 Parents: 515e2be Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Feb 5 20:06:19 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Feb 5 20:12:47 2016 +0100 ---------------------------------------------------------------------- .../apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a06d3317/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java index b6e40be..699337b 100644 --- a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java +++ b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java @@ -254,7 +254,7 @@ public class JavaxUpgradeHttpRequest implements HttpServletRequest @Override public StringBuffer getRequestURL() { - return null; + return new StringBuffer(requestUri); } @Override
