Author: markt
Date: Wed Jun 22 23:33:39 2011
New Revision: 1138684
URL: http://svn.apache.org/viewvc?rev=1138684&view=rev
Log:
Connector refactoring
Rename socketWrapper to socket to align with BIO/APR
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.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=1138684&r1=1138683&r2=1138684&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Wed Jun 22
23:33:39 2011
@@ -168,11 +168,11 @@ public class AjpNioProtocol extends Abst
}
@Override
- public SocketState process(SocketWrapper<NioChannel> socketWrapper,
+ public SocketState process(SocketWrapper<NioChannel> socket,
SocketStatus status) {
- AjpNioProcessor processor = connections.remove(socketWrapper);
+ AjpNioProcessor processor = connections.remove(socket);
- socketWrapper.setAsync(false); //no longer check for timeout
+ socket.setAsync(false); //no longer check for timeout
try {
if (processor == null) {
@@ -187,7 +187,7 @@ public class AjpNioProtocol extends Abst
if (processor.isAsync() || state == SocketState.ASYNC_END)
{
state = processor.asyncDispatch(status);
} else {
- state = processor.process(socketWrapper.getSocket());
+ state = processor.process(socket.getSocket());
}
if (processor.isAsync()) {
@@ -198,17 +198,17 @@ public class AjpNioProtocol extends Abst
if (state == SocketState.LONG) {
// In the middle of processing a request/response. Keep the
// socket associated with the processor.
- connections.put(socketWrapper, processor);
+ connections.put(socket, processor);
- socketWrapper.setAsync(true);
+ socket.setAsync(true);
} else if (state == SocketState.OPEN){
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
- release(socketWrapper, processor);
-
socketWrapper.getSocket().getPoller().add(socketWrapper.getSocket());
+ release(socket, processor);
+ socket.getSocket().getPoller().add(socket.getSocket());
} else {
// Connection closed. OK to recycle the processor.
- release(socketWrapper, processor);
+ release(socket, processor);
}
return state;
@@ -231,7 +231,7 @@ public class AjpNioProtocol extends Abst
// less-than-verbose logs.
log.error(sm.getString("ajpprotocol.proto.error"), e);
}
- release(socketWrapper, processor);
+ release(socket, processor);
return SocketState.CLOSED;
}
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=1138684&r1=1138683&r2=1138684&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Wed Jun
22 23:33:39 2011
@@ -231,11 +231,11 @@ public class Http11NioProtocol extends A
@Override
- public SocketState process(SocketWrapper<NioChannel> socketWrapper,
+ public SocketState process(SocketWrapper<NioChannel> socket,
SocketStatus status) {
- Http11NioProcessor processor = connections.remove(socketWrapper);
+ Http11NioProcessor processor = connections.remove(socket);
- socketWrapper.setAsync(false); //no longer check for timeout
+ socket.setAsync(false); //no longer check for timeout
try {
if (processor == null) {
@@ -247,8 +247,8 @@ public class Http11NioProtocol extends A
if (proto.isSSLEnabled() &&
(proto.sslImplementation != null)
- && (socketWrapper.getSocket() instanceof
SecureNioChannel)) {
- SecureNioChannel ch =
(SecureNioChannel)socketWrapper.getSocket();
+ && (socket.getSocket() instanceof SecureNioChannel)) {
+ SecureNioChannel ch = (SecureNioChannel)socket.getSocket();
processor.setSslSupport(
proto.sslImplementation.getSSLSupport(
ch.getSslEngine().getSession()));
@@ -263,7 +263,7 @@ public class Http11NioProtocol extends A
} else if (processor.comet) {
state = processor.event(status);
} else {
- state = processor.process(socketWrapper.getSocket());
+ state = processor.process(socket.getSocket());
}
if (processor.isAsync()) {
@@ -274,29 +274,29 @@ public class Http11NioProtocol extends A
if (state == SocketState.LONG) {
// In the middle of processing a request/response. Keep the
// socket associated with the processor.
- connections.put(socketWrapper, processor);
+ connections.put(socket, processor);
if (processor.isAsync()) {
- socketWrapper.setAsync(true);
+ socket.setAsync(true);
} else {
// Either:
// - this is comet request
// - the request line/headers have not been completely
// read
- SelectionKey key =
socketWrapper.getSocket().getIOChannel().keyFor(
-
socketWrapper.getSocket().getPoller().getSelector());
+ SelectionKey key =
socket.getSocket().getIOChannel().keyFor(
+ socket.getSocket().getPoller().getSelector());
key.interestOps(SelectionKey.OP_READ);
- ((KeyAttachment) socketWrapper).interestOps(
+ ((KeyAttachment) socket).interestOps(
SelectionKey.OP_READ);
}
} else if (state == SocketState.OPEN){
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
- release(socketWrapper, processor);
-
socketWrapper.getSocket().getPoller().add(socketWrapper.getSocket());
+ release(socket, processor);
+ socket.getSocket().getPoller().add(socket.getSocket());
} else {
// Connection closed. OK to recycle the processor.
- release(socketWrapper, processor);
+ release(socket, processor);
}
return state;
@@ -319,7 +319,7 @@ public class Http11NioProtocol extends A
// less-than-verbose logs.
log.error(sm.getString("http11protocol.proto.error"), e);
}
- release(socketWrapper, processor);
+ release(socket, processor);
return SocketState.CLOSED;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
