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 2014/02/14 09:59:47 UTC
git commit: Support Native WebSocket JSR356 for JBoss Wildfly
8.0.Final
Updated Branches:
refs/heads/master 9d0c65e33 -> e4c47ae00
Support Native WebSocket JSR356 for JBoss Wildfly 8.0.Final
https://issues.jboss.org/browse/WFLY-2935
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e4c47ae0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e4c47ae0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e4c47ae0
Branch: refs/heads/master
Commit: e4c47ae00ebb782992d60af57d4f3703c2703a47
Parents: 9d0c65e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Feb 14 10:55:28 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Feb 14 10:55:28 2014 +0200
----------------------------------------------------------------------
.../wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java | 9 ++++++++-
.../wicket/protocol/ws/javax/JavaxWebSocketProcessor.java | 7 ++++---
.../org/apache/wicket/protocol/ws/javax/WicketEndpoint.java | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e4c47ae0/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 e318c93..b6e40be 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
@@ -43,6 +43,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpUpgradeHandler;
import javax.servlet.http.Part;
+import javax.websocket.EndpointConfig;
import javax.websocket.Session;
import org.apache.wicket.util.string.StringValue;
@@ -60,10 +61,16 @@ public class JavaxUpgradeHttpRequest implements HttpServletRequest
private final Map<String, String[]> parametersMap;
private final Map<String, List<String>> headers;
- public JavaxUpgradeHttpRequest(final Session session)
+ public JavaxUpgradeHttpRequest(final Session session, EndpointConfig endpointConfig)
{
Map<String, Object> userProperties = session.getUserProperties();
+ if (userProperties == null || userProperties.isEmpty())
+ {
+ // workaround for JBoss Wildfly 8.0.Final
+ userProperties = endpointConfig.getUserProperties();
+ }
+
this.httpSession = (HttpSession) userProperties.get("session");
this.headers = (Map<String, List<String>>) userProperties.get("headers");
this.queryString = session.getQueryString();
http://git-wip-us.apache.org/repos/asf/wicket/blob/e4c47ae0/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketProcessor.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketProcessor.java b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketProcessor.java
index 3462e34..c9d1479 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketProcessor.java
+++ b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketProcessor.java
@@ -18,6 +18,7 @@ package org.apache.wicket.protocol.ws.javax;
import java.nio.ByteBuffer;
+import javax.websocket.EndpointConfig;
import javax.websocket.MessageHandler;
import javax.websocket.Session;
@@ -38,11 +39,11 @@ public class JavaxWebSocketProcessor extends AbstractWebSocketProcessor
* @param session
* the WebSocket session
* @param application
- * the current Wicket Application
+ * @param endpointConfig
*/
- public JavaxWebSocketProcessor(final Session session, final WebApplication application)
+ public JavaxWebSocketProcessor(final Session session, final WebApplication application, EndpointConfig endpointConfig)
{
- super(new JavaxUpgradeHttpRequest(session), application);
+ super(new JavaxUpgradeHttpRequest(session, endpointConfig), application);
onConnect(new JavaxWebSocketConnection(session, this));
http://git-wip-us.apache.org/repos/asf/wicket/blob/e4c47ae0/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketEndpoint.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketEndpoint.java b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketEndpoint.java
index 6a9a74a..e7cecf6 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketEndpoint.java
+++ b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketEndpoint.java
@@ -55,7 +55,7 @@ public class WicketEndpoint extends Endpoint
try
{
ThreadContext.setApplication(app);
- javaxWebSocketProcessor = new JavaxWebSocketProcessor(session, app);
+ javaxWebSocketProcessor = new JavaxWebSocketProcessor(session, app, endpointConfig);
}
finally
{