Repository: wicket
Updated Branches:
  refs/heads/wicket-7.x a528f937b -> e0b3c7a6d


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/e0b3c7a6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e0b3c7a6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e0b3c7a6

Branch: refs/heads/wicket-7.x
Commit: e0b3c7a6d53f57e44c44ac5e03e15d54af05530c
Parents: a528f93
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:06:19 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/e0b3c7a6/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

Reply via email to