svn commit: r1496210 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

[ma...@apache.org]

Author: markt
Date: Mon Jun 24 20:45:13 2013
New Revision: 1496210

URL: http://svn.apache.org/r1496210
Log:
Remove the TCK hack. I no longer have access to the preview of the WebSocket TCK.

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=1496210&r1=1496209&r2=1496210&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Mon Jun 24 20:45:13 2013
@@ -55,7 +55,6 @@ import javax.net.ssl.SSLException;
 import javax.net.ssl.TrustManagerFactory;
 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;
@@ -181,24 +180,10 @@ 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org