Author: markt
Date: Mon Mar 25 13:17:41 2013
New Revision: 1460648
URL: http://svn.apache.org/r1460648
Log:
Javadoc says use empty string not null for no agreed sub-protocol
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1460648&r1=1460647&r2=1460648&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Mon Mar 25
13:17:41 2013
@@ -126,7 +126,11 @@ public class WsSession implements Sessio
}
this.queryString = queryString;
this.userPrincipal = userPrincipal;
- this.subProtocol = subProtocol;
+ if (subProtocol == null) {
+ this.subProtocol = "";
+ } else {
+ this.subProtocol = subProtocol;
+ }
this.pathParameters = pathParameters;
this.secure = secure;
this.wsRemoteEndpoint.setEncoders(encoders);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
