Author: markt
Date: Fri Aug 30 23:01:49 2013
New Revision: 1519109
URL: http://svn.apache.org/r1519109
Log:
Align further with NIO. Simplify the timeout code.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1519109&r1=1519108&r2=1519109&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Aug 30
23:01:49 2013
@@ -98,12 +98,11 @@ public class AjpProcessor extends Abstra
// Setting up the socket
this.socketWrapper = socket;
+
input = socket.getSocket().getInputStream();
output = socket.getSocket().getOutputStream();
- int soTimeout = -1;
- if (keepAliveTimeout > 0) {
- soTimeout = socket.getSocket().getSoTimeout();
- }
+
+ int soTimeout = endpoint.getSoTimeout();
boolean cping = false;
// Error flag
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
