Author: markt
Date: Fri Jun 17 16:17:21 2011
New Revision: 1136923
URL: http://svn.apache.org/viewvc?rev=1136923&view=rev
Log:
Connector re-factoring
No functional change
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1136923&r1=1136922&r2=1136923&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Fri Jun 17
16:17:21 2011
@@ -207,7 +207,7 @@ public class AjpNioProtocol extends Abst
}
@Override
- public SocketState process(NioChannel socket) {
+ public SocketState process(NioChannel socket, SocketStatus status) {
AjpNioProcessor processor = connections.remove(socket);
try {
if (processor == null) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1136923&r1=1136922&r2=1136923&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Fri Jun
17 16:17:21 2011
@@ -293,7 +293,7 @@ public class Http11NioProtocol extends A
}
@Override
- public SocketState process(NioChannel socket) {
+ public SocketState process(NioChannel socket, SocketStatus status) {
Http11NioProcessor processor = connections.remove(socket);
try {
if (processor == null) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1136923&r1=1136922&r2=1136923&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Jun 17
16:17:21 2011
@@ -1482,7 +1482,7 @@ public class NioEndpoint extends Abstrac
* thread local fields.
*/
public interface Handler extends AbstractEndpoint.Handler {
- public SocketState process(NioChannel socket);
+ public SocketState process(NioChannel socket, SocketStatus status);
public SocketState event(NioChannel socket, SocketStatus status);
public void release(NioChannel socket);
public void release(SocketChannel socket);
@@ -1529,7 +1529,11 @@ public class NioEndpoint extends Abstrac
if ( handshake == 0 ) {
SocketState state = SocketState.OPEN;
// Process the request from this socket
- state =
(status==null)?handler.process(socket):handler.event(socket,status);
+ if (status == null) {
+ state = handler.process(socket, SocketStatus.OPEN);
+ } else {
+ state = handler.event(socket, status);
+ }
if (state == SocketState.CLOSED) {
// Close socket and pool
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
