tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1519413 - /tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Date Mon, 02 Sep 2013 12:27:37 GMT
Author: markt
Date: Mon Sep  2 12:27:37 2013
New Revision: 1519413

URL: http://svn.apache.org/r1519413
Log:
Use output methods to write PONG packet. Aligns APR/native with BIO and NIO to aid future
refactoring.

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

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1519413&r1=1519412&r2=1519413&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Mon Sep  2 12:27:37 2013
@@ -137,10 +137,12 @@ public class AjpAprProcessor extends Abs
                         break;
                     }
                     cping = true;
-                    if (Socket.send(socketRef, pongMessageArray, 0,
-                            pongMessageArray.length) < 0) {
+                    try {
+                        output(pongMessageArray, 0, pongMessageArray.length);
+                    } catch (IOException e) {
                         error = true;
                     }
+                    recycle(false);
                     continue;
                 } else if(type != Constants.JK_AJP13_FORWARD_REQUEST) {
                     // Unexpected packet type. Unread body packets should have



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


Mime
View raw message