Author: markt
Date: Thu Feb 14 09:42:56 2013
New Revision: 1446085
URL: http://svn.apache.org/r1446085
Log:
No extensions supported at this point.
Modified:
tomcat/trunk/java/javax/websocket/WebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Modified: tomcat/trunk/java/javax/websocket/WebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/WebSocketContainer.java?rev=1446085&r1=1446084&r2=1446085&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/WebSocketContainer.java (original)
+++ tomcat/trunk/java/javax/websocket/WebSocketContainer.java Thu Feb 14
09:42:56 2013
@@ -87,5 +87,9 @@ public interface WebSocketContainer {
*/
void setDefaultMaxTextMessageBufferSize(int max);
+ /**
+ * Get the set of extensions that are supported by this WebSocket
+ * implementation.
+ */
Set<Extension> getInstalledExtensions();
}
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=1446085&r1=1446084&r2=1446085&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Thu
Feb 14 09:42:56 2013
@@ -24,6 +24,7 @@ import java.nio.ByteBuffer;
import java.nio.channels.AsynchronousSocketChannel;
import java.nio.charset.Charset;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -413,10 +414,14 @@ public class WsWebSocketContainer implem
}
+ /**
+ * {@inheritDoc}
+ *
+ * Currently, this implementation does not support any extensions.
+ */
@Override
public Set<Extension> getInstalledExtensions() {
- // TODO Auto-generated method stub
- return null;
+ return Collections.EMPTY_SET;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
