Author: markt Date: Tue Nov 3 09:22:49 2015 New Revision: 1712228 URL: http://svn.apache.org/viewvc?rev=1712228&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58539 Logical rather than bitwise AND is required here
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java 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=1712228&r1=1712227&r2=1712228&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Tue Nov 3 09:22:49 2015 @@ -469,7 +469,7 @@ public abstract class WsFrameBase { CloseCodes.TOO_BIG, sm.getString("wsFrame.textMessageTooBig"))); } - } else if (cr.isUnderflow() & !last) { + } else if (cr.isUnderflow() && !last) { // End of frame and possible message as well. if (continuationExpected) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org