Author: markt
Date: Mon Aug 20 16:11:52 2018
New Revision: 1838433
URL: http://svn.apache.org/viewvc?rev=1838433&view=rev
Log:
Refactor for consistency
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
tomcat/trunk/java/org/apache/tomcat/util/net/WriteBuffer.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1838433&r1=1838432&r2=1838433&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Aug 20
16:11:52 2018
@@ -2598,9 +2598,9 @@ public class AprEndpoint extends Abstrac
@Override
- protected boolean writeNonBlockingDirect(ByteBuffer from) throws
IOException {
+ protected void writeNonBlockingDirect(ByteBuffer from) throws
IOException {
if (from.isDirect()) {
- return super.writeNonBlockingDirect(from);
+ super.writeNonBlockingDirect(from);
} else {
// The socket write buffer capacity is socket.appWriteBufSize
ByteBuffer writeBuffer = socketBufferHandler.getWriteBuffer();
@@ -2614,7 +2614,6 @@ public class AprEndpoint extends Abstrac
// Didn't write the whole amount of data in the last
// non-blocking write.
// Exit the loop.
- return true;
}
}
@@ -2622,8 +2621,6 @@ public class AprEndpoint extends Abstrac
socketBufferHandler.configureWriteBufferForWrite();
transfer(from, writeBuffer);
}
-
- return false;
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1838433&r1=1838432&r2=1838433&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Mon Aug
20 16:11:52 2018
@@ -625,26 +625,24 @@ public abstract class SocketWrapperBase<
* Separate method so it can be re-used by the socket write buffer to write
* data to the network
*/
- boolean writeNonBlockingInternal(ByteBuffer from) throws IOException {
+ void writeNonBlockingInternal(ByteBuffer from) throws IOException {
// TODO Explore refactoring this method back into writeNonBlocking
if (socketBufferHandler.isWriteBufferEmpty()) {
- return writeNonBlockingDirect(from);
+ writeNonBlockingDirect(from);
} else {
socketBufferHandler.configureWriteBufferForWrite();
transfer(from, socketBufferHandler.getWriteBuffer());
if (!socketBufferHandler.isWriteBufferWritable()) {
doWrite(false);
if (socketBufferHandler.isWriteBufferWritable()) {
- return writeNonBlockingDirect(from);
+ writeNonBlockingDirect(from);
}
}
}
-
- return !socketBufferHandler.isWriteBufferWritable();
}
- protected boolean writeNonBlockingDirect(ByteBuffer from) throws
IOException {
+ protected void writeNonBlockingDirect(ByteBuffer from) throws IOException {
// The socket write buffer capacity is socket.appWriteBufSize
// TODO This only matters when using TLS. For non-TLS connections it
// should be possible to write the ByteBuffer in a single write
@@ -659,7 +657,7 @@ public abstract class SocketWrapperBase<
// Didn't write the whole amount of data in the last
// non-blocking write.
// Exit the loop.
- return true;
+ return;
}
}
@@ -667,8 +665,6 @@ public abstract class SocketWrapperBase<
socketBufferHandler.configureWriteBufferForWrite();
transfer(from, socketBufferHandler.getWriteBuffer());
}
-
- return false;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/WriteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/WriteBuffer.java?rev=1838433&r1=1838432&r2=1838433&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/WriteBuffer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/WriteBuffer.java Mon Aug 20
16:11:52 2018
@@ -107,10 +107,12 @@ public class WriteBuffer {
if (blocking) {
socketWrapper.writeBlocking(buffer.getBuf());
} else {
- dataLeft =
socketWrapper.writeNonBlockingInternal(buffer.getBuf());
+ socketWrapper.writeNonBlockingInternal(buffer.getBuf());
}
if (buffer.getBuf().remaining() == 0) {
bufIter.remove();
+ } else {
+ dataLeft = true;
}
}
return dataLeft;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
