2012/3/1  <ma...@apache.org>:
> Author: markt
> Date: Wed Feb 29 21:24:59 2012
> New Revision: 1295286
>
> URL: http://svn.apache.org/viewvc?rev=1295286&view=rev
> Log:
> Fix a TODO
>
> Modified:
>    tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java
>
> Modified: 
> tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties?rev=1295286&r1=1295285&r2=1295286&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties 
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties 
> Wed Feb 29 21:24:59 2012
> @@ -15,6 +15,7 @@
>
>  frame.eos=The end of the stream was reached before the expected number of 
> payload bytes could be read
>  frame.invalidUtf8=A sequence of bytes was received that did not represent 
> valid UTF-8
> +frame.readFailed=Failed to read the first byte of the next WebSocket frame. 
> The return value from the read was [{0}]
>  frame.notMasked=The client frame was not masked but all client frames must 
> be masked
>
>  is.notContinuation=A frame with the OpCode [{0}] was received when a 
> continuation frame was expected
>
> Modified: tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java?rev=1295286&r1=1295285&r2=1295286&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java Wed Feb 29 
> 21:24:59 2012
> @@ -215,8 +215,8 @@ public class WsFrame {
>         } else if (read == 0) {
>             return null;
>         } else {
> -            // TODO message
> -            throw new IOException();
> +            throw new IOException(
> +                    sm.getString("frame.readFailed", Integer.valueOf(read)));

Maybe java.io.EOFException ?
I see that read can be -1 here.

>         }
>     }
>  }
>

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

Reply via email to