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:17:14 UTC
svn commit: r1138678 -
/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Author: markt
Date: Wed Jun 22 23:17:14 2011
New Revision: 1138678
URL: http://svn.apache.org/viewvc?rev=1138678&view=rev
Log:
Connector refactoring
Another small step towards SocketWrapper for NIO
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
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=1138678&r1=1138677&r2=1138678&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:17:14 2011
@@ -30,6 +30,7 @@ import org.apache.tomcat.util.net.Abstra
import org.apache.tomcat.util.net.NioChannel;
import org.apache.tomcat.util.net.NioEndpoint;
import org.apache.tomcat.util.net.NioEndpoint.Handler;
+import org.apache.tomcat.util.net.NioEndpoint.KeyAttachment;
import org.apache.tomcat.util.net.SSLImplementation;
import org.apache.tomcat.util.net.SecureNioChannel;
import org.apache.tomcat.util.net.SocketStatus;
@@ -234,8 +235,7 @@ public class Http11NioProtocol extends A
NioChannel socket = socketWrapper.getSocket();
Http11NioProcessor processor = connections.remove(socket);
- NioEndpoint.KeyAttachment att = (NioEndpoint.KeyAttachment)socket.getAttachment(false);
- att.setAsync(false); //no longer check for timeout
+ socketWrapper.setAsync(false); //no longer check for timeout
try {
if (processor == null) {
@@ -277,7 +277,7 @@ public class Http11NioProtocol extends A
connections.put(socket, processor);
if (processor.isAsync()) {
- att.setAsync(true);
+ socketWrapper.setAsync(true);
} else {
// Either:
// - this is comet request
@@ -286,7 +286,8 @@ public class Http11NioProtocol extends A
SelectionKey key = socket.getIOChannel().keyFor(
socket.getPoller().getSelector());
key.interestOps(SelectionKey.OP_READ);
- att.interestOps(SelectionKey.OP_READ);
+ ((KeyAttachment) socketWrapper).interestOps(
+ SelectionKey.OP_READ);
}
} else if (state == SocketState.OPEN){
// In keep-alive but between requests. OK to recycle
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org