svn commit: r1625379 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/Util.java java/org/apache/tomcat/websocket/WsFrameBase.java

[violetagg]

Author: violetagg
Date: Tue Sep 16 20:21:02 2014
New Revision: 1625379

URL: http://svn.apache.org/r1625379
Log:
Merged revision 1605061 from tomcat/trunk:
Add a new utility method and make use of it (will also be used in 
permessage-deflate)

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1605061

Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java?rev=1625379&r1=1625378&r2=1625379&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java Tue Sep 16 
20:21:02 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/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1625379&r1=1625378&r2=1625379&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Tue 
Sep 16 20:21:02 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