You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/06/15 18:19:06 UTC
svn commit: r1136106 - in /tomcat/trunk/java/org/apache/coyote/ajp:
AjpNioProcessor.java AjpProcessor.java
Author: markt
Date: Wed Jun 15 16:19:06 2011
New Revision: 1136106
URL: http://svn.apache.org/viewvc?rev=1136106&view=rev
Log:
Align code between connectors in preparation for pulling code up to the superclass
No need to close the AJP connection if there was no error
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1136106&r1=1136105&r2=1136106&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Wed Jun 15 16:19:06 2011
@@ -363,7 +363,11 @@ public class AjpNioProcessor extends Abs
}
} else {
request.updateCounters();
- return SocketState.CLOSED;
+ if (error) {
+ return SocketState.CLOSED;
+ } else {
+ return SocketState.OPEN;
+ }
}
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=1136106&r1=1136105&r2=1136106&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Jun 15 16:19:06 2011
@@ -370,7 +370,11 @@ public class AjpProcessor extends Abstra
}
} else {
request.updateCounters();
- return SocketState.CLOSED;
+ if (error) {
+ return SocketState.CLOSED;
+ } else {
+ return SocketState.OPEN;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org