tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r375625 - in /tomcat/connectors/trunk: http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Date Tue, 07 Feb 2006 15:16:04 GMT
Author: remm
Date: Tue Feb  7 07:16:02 2006
New Revision: 375625

URL: http://svn.apache.org/viewcvs?rev=375625&view=rev
Log:
- Switch back to using a native fix (in order to not having to do too many JNI calls, since
it's
  the whole point).

Modified:
    tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
    tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java

Modified: tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=375625&r1=375624&r2=375625&view=diff
==============================================================================
--- tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
(original)
+++ tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
Tue Feb  7 07:16:02 2006
@@ -695,14 +695,9 @@
     protected void flushBuffer()
         throws IOException {
         if (bbuf.position() > 0) {
-            int i = 0;
-            int n = 0;
-            do {
-                if ((n = Socket.sendbb(socket, i, bbuf.position() - i)) < 0) {
-                    throw new IOException();
-                }
-                i += n;
-            } while (i < bbuf.position());
+            if (Socket.sendbb(socket, 0, bbuf.position()) < 0) {
+                throw new IOException();
+            }
             bbuf.clear();
         }
     }

Modified: tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=375625&r1=375624&r2=375625&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java Tue Feb  7
07:16:02 2006
@@ -1169,14 +1169,9 @@
     protected void flush()
         throws IOException {
         if (outputBuffer.position() > 0) {
-            int i = 0;
-            int n = 0;
-            do {
-                if ((n = Socket.sendbb(socket, i, outputBuffer.position() - i)) < 0) {
-                    throw new IOException();
-                }
-                i += n;
-            } while (i < outputBuffer.position());
+            if (Socket.sendbb(socket, 0, outputBuffer.position()) < 0) {
+                throw new IOException();
+            }
             outputBuffer.clear();
         }
     }



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


Mime
View raw message