svn commit: r1605061 - in /tomcat/trunk/java/org/apache/tomcat/websocket: Util.java WsFrameBase.java

[markt]

Author: markt
Date: Tue Jun 24 12:05:01 2014
New Revision: 1605061

URL: http://svn.apache.org/r1605061
Log:
Add a new utility method and make use of it (will also be used in 
permessage-deflate)

Modified:
    tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
    tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Util.java?rev=1605061&r1=1605060&r2=1605061&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/Util.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Util.java Tue Jun 24 12:05:01 
2014
@@ -78,6 +78,11 @@ public class Util {
     }
 
 
+    static boolean isContinuation(byte opCode) {
+        return opCode == Constants.OPCODE_CONTINUATION;
+    }
+
+
     static CloseCode getCloseCode(int code) {
         if (code > 2999 && code < 5000) {
             return CloseCodes.NORMAL_CLOSURE;

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1605061&r1=1605060&r2=1605061&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Tue Jun 24 
12:05:01 2014
@@ -170,7 +170,7 @@ public abstract class WsFrameBase {
             }
         } else {
             if (continuationExpected) {
-                if (opCode != Constants.OPCODE_CONTINUATION) {
+                if (!Util.isContinuation(opCode)) {
                     throw new WsIOException(new CloseReason(
                             CloseCodes.PROTOCOL_ERROR,
                             sm.getString("wsFrame.noContinuation")));



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