Author: markt
Date: Sun Nov 23 22:50:37 2014
New Revision: 1641281
URL: http://svn.apache.org/r1641281
Log:
Use registerForEvent on SocketWrapper
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1641281&r1=1641280&r2=1641281&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Sun Nov
23 22:50:37 2014
@@ -1675,8 +1675,14 @@ public abstract class AbstractAjpProcess
}
}
- // ------------------------------------- InputStreamInputBuffer Inner Class
+ @Override
+ protected void registerForEvent(boolean read, boolean write) {
+ socketWrapper.regsiterForEvent(read, write);
+ }
+
+
+ // ------------------------------------- InputStreamInputBuffer Inner Class
/**
* This class is an input buffer which will read its data from an input
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1641281&r1=1641280&r2=1641281&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sun Nov 23
22:50:37 2014
@@ -42,11 +42,4 @@ public class AjpAprProcessor extends Abs
public AjpAprProcessor(int packetSize, AprEndpoint endpoint) {
super(packetSize, endpoint);
}
-
-
- @Override
- protected void registerForEvent(boolean read, boolean write) {
- ((AprEndpoint) endpoint).getPoller().add(
- socketWrapper.getSocket().longValue(), -1, read, write);
- }
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java?rev=1641281&r1=1641280&r2=1641281&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java Sun Nov 23
22:50:37 2014
@@ -35,10 +35,4 @@ public class AjpNio2Processor extends Ab
public AjpNio2Processor(int packetSize, Nio2Endpoint endpoint0) {
super(packetSize, endpoint0);
}
-
- @Override
- protected void registerForEvent(boolean read, boolean write) {
- // Nothing to do here, the appropriate operations should
- // already be pending
- }
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1641281&r1=1641280&r2=1641281&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Sun Nov 23
22:50:37 2014
@@ -16,8 +16,6 @@
*/
package org.apache.coyote.ajp;
-import java.nio.channels.SelectionKey;
-
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.NioChannel;
@@ -38,24 +36,4 @@ public class AjpNioProcessor extends Abs
public AjpNioProcessor(int packetSize, NioEndpoint endpoint) {
super(packetSize, endpoint);
}
-
-
- @Override
- protected void registerForEvent(boolean read, boolean write) {
- final NioChannel socket = socketWrapper.getSocket();
- final NioEndpoint.NioSocketWrapper attach =
- (NioEndpoint.NioSocketWrapper) socket.getAttachment(false);
- if (attach == null) {
- return;
- }
- SelectionKey key =
socket.getIOChannel().keyFor(socket.getPoller().getSelector());
- if (read) {
- attach.interestOps(attach.interestOps() | SelectionKey.OP_READ);
- key.interestOps(key.interestOps() | SelectionKey.OP_READ);
- }
- if (write) {
- attach.interestOps(attach.interestOps() | SelectionKey.OP_WRITE);
- key.interestOps(key.interestOps() | SelectionKey.OP_READ);
- }
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
