Author: markt
Date: Mon Feb 20 23:41:33 2012
New Revision: 1291521
URL: http://svn.apache.org/viewvc?rev=1291521&view=rev
Log:
Fix up logic
Make behaviour clearer.
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
Modified: tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1291521&r1=1291520&r2=1291521&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java Mon Feb
20 23:41:33 2012
@@ -59,12 +59,15 @@ public abstract class StreamInbound impl
if (opCode == Constants.OPCODE_BINARY) {
onBinaryData(wsIs);
+ return SocketState.UPGRADED;
} else if (opCode == Constants.OPCODE_TEXT) {
InputStreamReader r =
new InputStreamReader(wsIs, B2CConverter.UTF_8);
onTextData(r);
+ return SocketState.UPGRADED;
}
+ // Must be a control from and they have limited pay load length
if (wsIs.getPayloadLength() > 125) {
getOutbound().close(1002, null);
return SocketState.CLOSED;
@@ -75,13 +78,14 @@ public abstract class StreamInbound impl
return SocketState.CLOSED;
} else if (opCode == Constants.OPCODE_PING) {
doPing(wsIs);
+ return SocketState.UPGRADED;
} else if (opCode == Constants.OPCODE_PONG) {
doPong(wsIs);
- } else {
- // TODO i18n
- throw new IOException("OpCode " + opCode + " not supported");
+ return SocketState.UPGRADED;
}
- return SocketState.UPGRADED;
+
+ // TODO i18n
+ throw new IOException("OpCode " + opCode + " not supported");
}
private void doClose(InputStream is) throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
