Author: markt Date: Wed Oct 8 19:32:59 2014 New Revision: 1630210 URL: http://svn.apache.org/r1630210 Log: Correct logic (error detected by Autobahn test suite)
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java?rev=1630210&r1=1630209&r2=1630210&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java Wed Oct 8 19:32:59 2014 @@ -213,8 +213,8 @@ public class PerMessageDeflate implement } } } else if (written == 0) { - if (fin && (isServer && !serverContextTakeover || - !isServer && !clientContextTakeover)) { + if (fin && (isServer && !clientContextTakeover || + !isServer && !serverContextTakeover)) { inflater.reset(); } return TransformationResult.END_OF_FRAME; @@ -426,7 +426,7 @@ public class PerMessageDeflate implement private void startNewMessage() { firstCompressedFrameWritten = false; - if (isServer && !clientContextTakeover || !isServer && !serverContextTakeover) { + if (isServer && !serverContextTakeover || !isServer && !clientContextTakeover) { deflater.reset(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org