No need to return value from doWrite so remove it allowing slightly

simpler code.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1651046 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/tomcat/util/net/AprEndpoint.java

@@ -2509,7 +2509,7 @@ public void close() {
 
 
         @Override
-        protected int doWrite(boolean block) throws IOException {
+        protected void doWrite(boolean block) throws IOException {
             if (closed) {
                 throw new IOException(sm.getString("apr.closed", getSocket()));
             }
@@ -2520,7 +2520,7 @@ protected int doWrite(boolean block) throws IOException {
             readLock.lock();
             try {
                 if (getBlockingStatus() == block) {
-                    return doWriteInternal();
+                    doWriteInternal();
                 }
             } finally {
                 readLock.unlock();
@@ -2540,7 +2540,7 @@ protected int doWrite(boolean block) throws IOException {
                 readLock.lock();
                 try {
                     writeLock.unlock();
-                    return doWriteInternal();
+                    doWriteInternal();
                 } finally {
                     readLock.unlock();
                 }
@@ -2554,13 +2554,12 @@ protected int doWrite(boolean block) throws IOException {
         }
 
 
-        private int doWriteInternal() throws IOException {
+        private void doWriteInternal() throws IOException {
             if (!writeBufferFlipped) {
                 socketWriteBuffer.flip();
                 writeBufferFlipped = true;
             }
 
-            int written = 0;
             int thisTime;
 
             do {
@@ -2599,7 +2598,6 @@ private int doWriteInternal() throws IOException {
                     throw new IOException(sm.getString("socket.apr.write.error",
                             Integer.valueOf(-thisTime), getSocket(), this));
                 }
-                written += thisTime;
                 socketWriteBuffer.position(socketWriteBuffer.position() + thisTime);
             } while ((thisTime > 0 || getBlockingStatus()) && socketWriteBuffer.hasRemaining());
 
@@ -2611,8 +2609,6 @@ private int doWriteInternal() throws IOException {
             // write further up the stack. This is to ensure the socket is only
             // registered for write once as both container and user code can trigger
             // write registration.
-
-            return written;
         }
 
 

java/org/apache/tomcat/util/net/Nio2Endpoint.java

@@ -1153,18 +1153,15 @@ protected void writeNonBlocking(byte[] buf, int off, int len) throws IOException
          *              blocking case
          */
         @Override
-        protected int doWrite(boolean block) throws IOException {
-            int result = -1;
+        protected void doWrite(boolean block) throws IOException {
             try {
                 socketWriteBuffer.flip();
-                result = socketWriteBuffer.remaining();
                 while (socketWriteBuffer.hasRemaining()) {
                     if (getSocket().write(socketWriteBuffer).get(getTimeout(), TimeUnit.MILLISECONDS).intValue() < 0) {
                         throw new EOFException(sm.getString("iob.failedwrite"));
                     }
                 }
                 socketWriteBuffer.clear();
-                return result;
             } catch (ExecutionException e) {
                 if (e.getCause() instanceof IOException) {
                     throw (IOException) e.getCause();

java/org/apache/tomcat/util/net/NioEndpoint.java

@@ -1512,14 +1512,12 @@ private int fillReadBuffer(boolean block) throws IOException {
 
 
         @Override
-        protected synchronized int doWrite(boolean block)
-                throws IOException {
+        protected synchronized void doWrite(boolean block) throws IOException {
             if (!writeBufferFlipped) {
                 socketWriteBuffer.flip();
                 writeBufferFlipped = true;
             }
 
-            int written = 0;
             long writeTimeout = getWriteTimeout();
             Selector selector = null;
             try {
@@ -1528,7 +1526,7 @@ protected synchronized int doWrite(boolean block)
                 // Ignore
             }
             try {
-                written = pool.write(socketWriteBuffer, getSocket(), selector, writeTimeout, block);
+                pool.write(socketWriteBuffer, getSocket(), selector, writeTimeout, block);
                 // Make sure we are flushed
                 do {
                     if (getSocket().flush(true, selector, writeTimeout)) break;
@@ -1546,8 +1544,6 @@ protected synchronized int doWrite(boolean block)
             // write further up the stack. This is to ensure the socket is only
             // registered for write once as both container and user code can trigger
             // write registration.
-
-            return written;
         }
 
 

java/org/apache/tomcat/util/net/SocketWrapperBase.java

@@ -372,9 +372,7 @@ protected void writeNonBlocking(byte[] buf, int off, int len) throws IOException
             len = len - thisTime;
             while (socketWriteBuffer.remaining() == 0) {
                 off = off + thisTime;
-                if (doWrite(false) == 0) {
-                    break;
-                }
+                doWrite(false);
                 if (writeBufferFlipped) {
                     thisTime = 0;
                 } else {
@@ -484,12 +482,10 @@ protected boolean flushNonBlocking() throws IOException {
      *
      * @param block Should the write be blocking or not?
      *
-     * @return The number of bytes written
-     *
      * @throws IOException If an I/O error such as a timeout occurs during the
      *                     write
      */
-    protected abstract int doWrite(boolean block) throws IOException;
+    protected abstract void doWrite(boolean block) throws IOException;
 
 
     protected void addToBuffers(byte[] buf, int offset, int length) {