Author: markt
Date: Thu Mar 10 10:34:09 2011
New Revision: 1080173
URL: http://svn.apache.org/viewvc?rev=1080173&view=rev
Log:
status is always null, so simplify
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1080173&r1=1080172&r2=1080173&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu Mar 10
10:34:09 2011
@@ -760,8 +760,7 @@ public class AprEndpoint extends Abstrac
if (running) {
SocketWrapper<Long> wrapper =
new SocketWrapper<Long>(Long.valueOf(socket));
- getExecutor().execute(
- new SocketWithOptionsProcessor(wrapper, null));
+ getExecutor().execute(new SocketWithOptionsProcessor(wrapper));
}
} catch (RejectedExecutionException x) {
log.warn("Socket processing request was rejected for:"+socket,x);
@@ -1642,13 +1641,10 @@ public class AprEndpoint extends Abstrac
protected class SocketWithOptionsProcessor implements Runnable {
protected SocketWrapper<Long> socket = null;
- protected SocketStatus status = null;
- public SocketWithOptionsProcessor(SocketWrapper<Long> socket,
- SocketStatus status) {
+ public SocketWithOptionsProcessor(SocketWrapper<Long> socket) {
this.socket = socket;
- this.status = status;
}
@Override
@@ -1671,7 +1667,7 @@ public class AprEndpoint extends Abstrac
socket = null;
}
// Process the request from this socket
- Handler.SocketState state =
(status==null)?handler.process(socket):handler.asyncDispatch(socket, status);
+ Handler.SocketState state = handler.process(socket);
if (state == Handler.SocketState.CLOSED) {
// Close socket and pool
destroySocket(socket.getSocket().longValue());
@@ -1683,7 +1679,8 @@ public class AprEndpoint extends Abstrac
}
} else if (state == Handler.SocketState.ASYNC_END) {
socket.access();
- SocketProcessor proc = new SocketProcessor(socket,
SocketStatus.OPEN);
+ SocketProcessor proc =
+ new SocketProcessor(socket, SocketStatus.OPEN);
getExecutor().execute(proc);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
