[tomcat] branch master updated: Fix buffering strategy inconsistency

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new f2376d4  Fix buffering strategy inconsistency
f2376d4 is described below

commit f2376d49f90cf9ff5181ee9b77c0f6cc6923a4ef
Author: remm <r...@apache.org>
AuthorDate: Wed Nov 27 18:08:45 2019 +0100

    Fix buffering strategy inconsistency
    
    For now: buffer everything, write only when necessary.
---
 java/org/apache/tomcat/util/net/SocketWrapperBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 9a2662f..22bcf87 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -647,7 +647,7 @@ public abstract class SocketWrapperBase<E> {
     protected void writeNonBlockingInternal(ByteBuffer from) throws 
IOException {
         socketBufferHandler.configureWriteBufferForWrite();
         transfer(from, socketBufferHandler.getWriteBuffer());
-        while (from.hasRemaining() && 
!socketBufferHandler.isWriteBufferWritable()) {
+        while (from.hasRemaining()) {
             doWrite(false);
             if (socketBufferHandler.isWriteBufferWritable()) {
                 socketBufferHandler.configureWriteBufferForWrite();


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org