tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r330798 - /tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Date Fri, 04 Nov 2005 11:51:07 GMT
Author: remm
Date: Fri Nov  4 03:51:02 2005
New Revision: 330798

URL: http://svn.apache.org/viewcvs?rev=330798&view=rev
Log:
- Use the new methods from Mladen in the AJP connector.

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

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=330798&r1=330797&r2=330798&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 Fri Nov  4
03:51:02 2005
@@ -347,6 +347,8 @@
 
         // Setting up the socket
         this.socket = socket;
+        Socket.setrbb(this.socket, inputBuffer);
+        Socket.setsbb(this.socket, outputBuffer);
 
         // Error flag
         error = false;
@@ -999,8 +1001,8 @@
             inputBuffer.position(0);
         }
         while (inputBuffer.remaining() < n) {
-            int nRead = Socket.recvb
-                (socket, inputBuffer, inputBuffer.limit(), 
+            int nRead = Socket.recvbb
+                (socket, inputBuffer.limit(), 
                         inputBuffer.capacity() - inputBuffer.limit());
             if (nRead > 0) {
                 inputBuffer.limit(inputBuffer.limit() + nRead);
@@ -1031,8 +1033,8 @@
             inputBuffer.position(0);
         }
         while (inputBuffer.remaining() < n) {
-            int nRead = Socket.recvbt
-                (socket, inputBuffer, inputBuffer.limit(), 
+            int nRead = Socket.recvbbt
+                (socket, inputBuffer.limit(), 
                         inputBuffer.capacity() - inputBuffer.limit(), readTimeout);
             if (nRead > 0) {
                 inputBuffer.limit(inputBuffer.limit() + nRead);
@@ -1166,7 +1168,7 @@
     protected void flush()
         throws IOException {
         if (outputBuffer.position() > 0) {
-            if (Socket.sendb(socket, outputBuffer, 0, outputBuffer.position()) < 0) {
+            if (Socket.sendbb(socket, 0, outputBuffer.position()) < 0) {
                 throw new IOException(sm.getString("ajpprotocol.failedwrite"));
             }
             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