Author: remm Date: Thu Jan 15 15:41:02 2015 New Revision: 1652139 URL: http://svn.apache.org/r1652139 Log: Fix SSL NIO2 tests (and a glitch with non blocking probably), no idea how this happened since there's the same isEmpty for the write buffer.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java?rev=1652139&r1=1652138&r2=1652139&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java Thu Jan 15 15:41:02 2015 @@ -78,9 +78,9 @@ public class SocketBufferHandler { public boolean isReadBufferEmpty() { if (readBufferConfiguredForWrite) { - return readBuffer.position() > 0; + return readBuffer.position() == 0; } else { - return readBuffer.remaining() > 0; + return readBuffer.remaining() == 0; } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org