tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1292744 - /tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
Date Thu, 23 Feb 2012 11:32:32 GMT
Author: markt
Date: Thu Feb 23 11:32:31 2012
New Revision: 1292744

URL: http://svn.apache.org/viewvc?rev=1292744&view=rev
Log:
Improve the Javadoc

Modified:
    tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1292744&r1=1292743&r2=1292744&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Thu Feb 23 11:32:31
2012
@@ -199,7 +199,8 @@ public abstract class WebSocketServlet e
      *                      obligation to respect the declared preference
      * @return  <code>null</code> if no sub-protocol is selected or the name
of
      *          the protocol which <b>must</b> be one of the protocols listed
by
-     *          the client.
+     *          the client. This default implementation always returns
+     *          <code>null</code>.
      */
     protected String selectSubProtocol(List<String> subProtocols) {
         return null;
@@ -207,6 +208,7 @@ public abstract class WebSocketServlet e
 
     /**
      * Create the instance that will process this inbound connection.
+     * Applications must provide a new instance for each connection.
      *
      * @param subProtocol   The sub-protocol agreed between the client and
      *                      server or <code>null</code> if none was agreed



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message