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/23 01:32:17 UTC
svn commit: r1138682 - in /tomcat/trunk/java/org/apache/coyote:
ajp/AjpNioProtocol.java http11/Http11NioProtocol.java
Author: markt
Date: Wed Jun 22 23:32:17 2011
New Revision: 1138682
URL: http://svn.apache.org/viewvc?rev=1138682&view=rev
Log:
Remove the local socket object
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=1138682&r1=1138681&r2=1138682&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:32:17 2011
@@ -170,7 +170,6 @@ public class AjpNioProtocol extends Abst
@Override
public SocketState process(SocketWrapper<NioChannel> socketWrapper,
SocketStatus status) {
- NioChannel socket = socketWrapper.getSocket();
AjpNioProcessor processor = connections.remove(socketWrapper);
socketWrapper.setAsync(false); //no longer check for timeout
@@ -188,7 +187,7 @@ public class AjpNioProtocol extends Abst
if (processor.isAsync() || state == SocketState.ASYNC_END) {
state = processor.asyncDispatch(status);
} else {
- state = processor.process(socket);
+ state = processor.process(socketWrapper.getSocket());
}
if (processor.isAsync()) {
@@ -206,7 +205,7 @@ public class AjpNioProtocol extends Abst
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
release(socketWrapper, processor);
- socket.getPoller().add(socket);
+ socketWrapper.getSocket().getPoller().add(socketWrapper.getSocket());
} else {
// Connection closed. OK to recycle the processor.
release(socketWrapper, processor);
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=1138682&r1=1138681&r2=1138682&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:32:17 2011
@@ -233,7 +233,6 @@ public class Http11NioProtocol extends A
@Override
public SocketState process(SocketWrapper<NioChannel> socketWrapper,
SocketStatus status) {
- NioChannel socket = socketWrapper.getSocket();
Http11NioProcessor processor = connections.remove(socketWrapper);
socketWrapper.setAsync(false); //no longer check for timeout
@@ -248,8 +247,8 @@ public class Http11NioProtocol extends A
if (proto.isSSLEnabled() &&
(proto.sslImplementation != null)
- && (socket instanceof SecureNioChannel)) {
- SecureNioChannel ch = (SecureNioChannel)socket;
+ && (socketWrapper.getSocket() instanceof SecureNioChannel)) {
+ SecureNioChannel ch = (SecureNioChannel)socketWrapper.getSocket();
processor.setSslSupport(
proto.sslImplementation.getSSLSupport(
ch.getSslEngine().getSession()));
@@ -264,7 +263,7 @@ public class Http11NioProtocol extends A
} else if (processor.comet) {
state = processor.event(status);
} else {
- state = processor.process(socket);
+ state = processor.process(socketWrapper.getSocket());
}
if (processor.isAsync()) {
@@ -284,8 +283,8 @@ public class Http11NioProtocol extends A
// - this is comet request
// - the request line/headers have not been completely
// read
- SelectionKey key = socket.getIOChannel().keyFor(
- socket.getPoller().getSelector());
+ SelectionKey key = socketWrapper.getSocket().getIOChannel().keyFor(
+ socketWrapper.getSocket().getPoller().getSelector());
key.interestOps(SelectionKey.OP_READ);
((KeyAttachment) socketWrapper).interestOps(
SelectionKey.OP_READ);
@@ -294,7 +293,7 @@ public class Http11NioProtocol extends A
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
release(socketWrapper, processor);
- socket.getPoller().add(socket);
+ socketWrapper.getSocket().getPoller().add(socketWrapper.getSocket());
} else {
// Connection closed. OK to recycle the processor.
release(socketWrapper, processor);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org