Author: markt
Date: Fri Mar 22 20:30:49 2013
New Revision: 1459971
URL: http://svn.apache.org/r1459971
Log:
Hack to get the TCK to work
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1459971&r1=1459970&r2=1459971&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Fri
Mar 22 20:30:49 2013
@@ -40,6 +40,7 @@ import java.util.concurrent.Future;
import javax.websocket.ClientEndpoint;
import javax.websocket.ClientEndpointConfig;
+import javax.websocket.ClientEndpointConfig.Builder;
import javax.websocket.DeploymentException;
import javax.websocket.Endpoint;
import javax.websocket.Extension;
@@ -114,10 +115,24 @@ public class WsWebSocketContainer
}
+ @SuppressWarnings("unchecked")
@Override
public Session connectToServer(Class<?> annotatedEndpointClass, URI path)
throws DeploymentException {
+ // TODO: Remove this before release
+ /*
+ * This is a temporary hack to allow the WebSocket EA TCK to work. This
+ * has been confirmed as non-compliant with the EG lead so the TCK will
+ * have to change. For now, we need the TCK to work.
+ */
+ if (Endpoint.class.isAssignableFrom(annotatedEndpointClass)) {
+ return connectToServer(
+ (Class<? extends Endpoint>) annotatedEndpointClass,
+ Builder.create().build(), path);
+ }
+ // End of TCK hack
+
Object pojo;
try {
pojo = annotatedEndpointClass.newInstance();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
