Author: markt
Date: Mon Feb 20 22:53:29 2012
New Revision: 1291504
URL: http://svn.apache.org/viewvc?rev=1291504&view=rev
Log:
Remove the debug code I was using to figure out why the unmasking was
going wrong.
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=1291504&r1=1291503&r2=1291504&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java Mon Feb
20 22:53:29 2012
@@ -77,24 +77,20 @@ public abstract class StreamInbound impl
// Control messages have a max size of 125 bytes
ByteBuffer data = ByteBuffer.allocate(125);
- int status1 = is.read();
- int status2 = 0;
- System.out.println("" + status1);
- if (status1 != -1) {
- status1 = status1 << 8;
- status2 = is.read();
- System.out.println("" + status2);
- status1 = status1 + status2;
+ int status = is.read();
+ if (status != -1) {
+ status = status << 8;
+ status = status + is.read();
int read = 0;
while (read > -1) {
data.position(data.position() + read);
read = is.read(data.array(), data.position(),
data.remaining());
}
} else {
- status1 = 0;
+ status = 0;
}
data.flip();
- getOutbound().close(status1, data);
+ getOutbound().close(status, data);
}
protected abstract void onBinaryData(InputStream is) throws IOException;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
