You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2015/01/15 16:41:02 UTC
svn commit: r1652139 -
/tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1652139 - /tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java
Posted by Mark Thomas <ma...@apache.org>.
On 15/01/2015 15:41, remm@apache.org wrote:
> 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.
If memory serves me correctly the steps to reproduce this error are:
- stay up stupidly late trying to finish off some refactoring
- make a silly mistake because you are tired
- copy & paste code with silly mistake
- spot silly mistake but only fix the original
:)
Thanks for spotting and fixing this. For some reason this never
triggered an error on the laptop I have been using for development.
Cheers,
Mark
>
> 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-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org