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 2015/01/23 20:21:51 UTC
svn commit: r1654336 - in /tomcat/trunk/java/org/apache/coyote:
AbstractProcessor.java ajp/AjpProcessor.java http11/Http11AprProcessor.java
http11/Http11Nio2Processor.java http11/Http11NioProcessor.java
spdy/SpdyProcessor.java
Author: markt
Date: Fri Jan 23 19:21:50 2015
New Revision: 1654336
URL: http://svn.apache.org/r1654336
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1654336&r1=1654335&r2=1654336&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Fri Jan 23 19:21:50 2015
@@ -205,14 +205,5 @@ public abstract class AbstractProcessor<
@Override
public abstract HttpUpgradeHandler getHttpUpgradeHandler();
-
- /**
- * Register the socket for the specified events.
- *
- * @param read Register the socket for read events
- * @param write Register the socket for write events
- */
- protected abstract void registerForEvent(boolean read, boolean write);
-
protected abstract Log getLog();
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1654336&r1=1654335&r2=1654336&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Jan 23 19:21:50 2015
@@ -1569,12 +1569,6 @@ public class AjpProcessor<S> extends Abs
@Override
- protected void registerForEvent(boolean read, boolean write) {
- socketWrapper.regsiterForEvent(read, write);
- }
-
-
- @Override
protected Log getLog() {
return log;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1654336&r1=1654335&r2=1654336&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Fri Jan 23 19:21:50 2015
@@ -83,13 +83,6 @@ public class Http11AprProcessor extends
@Override
- protected void registerForEvent(boolean read, boolean write) {
- ((AprEndpoint) endpoint).getPoller().add(
- socketWrapper.getSocket().longValue(), -1, read, write);
- }
-
-
- @Override
protected void resetTimeouts() {
// NO-OP for APR
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1654336&r1=1654335&r2=1654336&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Fri Jan 23 19:21:50 2015
@@ -76,16 +76,6 @@ public class Http11Nio2Processor extends
}
}
- @Override
- protected void registerForEvent(boolean read, boolean write) {
- if (read) {
- socketWrapper.registerReadInterest();
- }
- if (write) {
- socketWrapper.registerWriteInterest();
- }
- }
-
@Override
protected void resetTimeouts() {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1654336&r1=1654335&r2=1654336&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Fri Jan 23 19:21:50 2015
@@ -18,7 +18,6 @@ package org.apache.coyote.http11;
import java.io.IOException;
import java.net.InetAddress;
-import java.nio.channels.SelectionKey;
import javax.net.ssl.SSLEngine;
@@ -62,22 +61,7 @@ public class Http11NioProcessor extends
}
- // --------------------------------------------------------- Public Methods
-
- @Override
- protected void registerForEvent(boolean read, boolean write) {
- final NioChannel socket = socketWrapper.getSocket();
-
- int interestOps = 0;
- if (read) {
- interestOps = SelectionKey.OP_READ;
- }
- if (write) {
- interestOps = interestOps | SelectionKey.OP_WRITE;
- }
- socket.getPoller().add(socket, interestOps);
- }
-
+ // ------------------------------------------------------ Protected Methods
@Override
protected void resetTimeouts() {
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java?rev=1654336&r1=1654335&r2=1654336&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java Fri Jan 23 19:21:50 2015
@@ -531,11 +531,6 @@ public class SpdyProcessor<S> extends Ab
return null;
}
- @Override
- protected void registerForEvent(boolean read, boolean write) {
- // NO-OP
- }
-
public void onSynStream(SpdyStream str) throws IOException {
this.spdyStream = str;
SpdyFrame frame = str.reqFrame;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org