Author: markt
Date: Sun Nov 23 22:51:27 2014
New Revision: 1641289
URL: http://svn.apache.org/r1641289
Log:
Pull up common process() method in AstractEndpoint.Handler interface
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1641289&r1=1641288&r2=1641289&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 23
22:51:27 2014
@@ -345,7 +345,7 @@ public abstract class AbstractProtocol<S
/**
* Obtain the handler associated with the underlying Endpoint
*/
- protected abstract Handler getHandler();
+ protected abstract Handler<S> getHandler();
// ----------------------------------------------------- JMX related
methods
@@ -563,7 +563,7 @@ public abstract class AbstractProtocol<S
// ------------------------------------------- Connection handler base
class
protected abstract static class AbstractConnectionHandler<S,P extends
Processor<S>>
- implements AbstractEndpoint.Handler {
+ implements AbstractEndpoint.Handler<S> {
protected abstract Log getLog();
@@ -591,6 +591,7 @@ public abstract class AbstractProtocol<S
}
+ @Override
public SocketState process(SocketWrapperBase<S> wrapper,
SocketStatus status) {
if (wrapper == null) {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1641289&r1=1641288&r2=1641289&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Sun Nov 23
22:51:27 2014
@@ -21,7 +21,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.AprEndpoint;
-import org.apache.tomcat.util.net.AprEndpoint.Handler;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -37,7 +36,7 @@ public class AjpAprProtocol extends Abst
@Override
- protected AbstractEndpoint.Handler getHandler() {
+ protected AbstractEndpoint.Handler<Long> getHandler() {
return cHandler;
}
@@ -88,8 +87,7 @@ public class AjpAprProtocol extends Abst
// -------------------------------------- AjpConnectionHandler Inner Class
protected static class AjpConnectionHandler
- extends AbstractAjpConnectionHandler<Long>
- implements Handler {
+ extends AbstractAjpConnectionHandler<Long> {
public AjpConnectionHandler(AjpAprProtocol proto) {
super(proto);
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1641289&r1=1641288&r2=1641289&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Sun Nov 23
22:51:27 2014
@@ -41,7 +41,7 @@ public class AjpNio2Protocol extends Abs
@Override
- protected AbstractEndpoint.Handler getHandler() {
+ protected AbstractEndpoint.Handler<Nio2Channel> getHandler() {
return cHandler;
}
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=1641289&r1=1641288&r2=1641289&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Sun Nov 23
22:51:27 2014
@@ -43,7 +43,7 @@ public class AjpNioProtocol extends Abst
@Override
- protected AbstractEndpoint.Handler getHandler() {
+ protected AbstractEndpoint.Handler<NioChannel> getHandler() {
return cHandler;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1641289&r1=1641288&r2=1641289&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Sun Nov
23 22:51:27 2014
@@ -28,7 +28,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.AprEndpoint;
-import org.apache.tomcat.util.net.AprEndpoint.Handler;
import org.apache.tomcat.util.net.AprEndpoint.Poller;
import org.apache.tomcat.util.net.SocketStatus;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -51,7 +50,7 @@ public class Http11AprProtocol extends A
@Override
- protected AbstractEndpoint.Handler getHandler() {
+ protected AbstractEndpoint.Handler<Long> getHandler() {
return cHandler;
}
@@ -217,7 +216,7 @@ public class Http11AprProtocol extends A
// -------------------- Connection handler --------------------
protected static class Http11ConnectionHandler
- extends AbstractConnectionHandler<Long,Http11AprProcessor>
implements Handler {
+ extends AbstractConnectionHandler<Long,Http11AprProcessor> {
protected Http11AprProtocol proto;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1641289&r1=1641288&r2=1641289&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Sun Nov
23 22:51:27 2014
@@ -52,7 +52,7 @@ public class Http11Nio2Protocol extends
@Override
- protected AbstractEndpoint.Handler getHandler() {
+ protected AbstractEndpoint.Handler<Nio2Channel> getHandler() {
return cHandler;
}
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=1641289&r1=1641288&r2=1641289&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Sun Nov
23 22:51:27 2014
@@ -57,7 +57,7 @@ public class Http11NioProtocol extends A
@Override
- protected AbstractEndpoint.Handler getHandler() {
+ protected AbstractEndpoint.Handler<NioChannel> getHandler() {
return cHandler;
}
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java?rev=1641289&r1=1641288&r2=1641289&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java Sun Nov 23
22:51:27 2014
@@ -87,7 +87,7 @@ public class SpdyProxyProtocol extends A
}
@Override
- protected Handler getHandler() {
+ protected Handler<NioChannel> getHandler() {
return cHandler;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1641289&r1=1641288&r2=1641289&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Sun Nov
23 22:51:27 2014
@@ -55,7 +55,8 @@ public abstract class AbstractEndpoint<S
protected static final StringManager sm = StringManager.getManager(
AbstractEndpoint.class.getPackage().getName());
- public static interface Handler {
+ public static interface Handler<S> {
+
/**
* Different types of socket states to react upon.
*/
@@ -67,6 +68,18 @@ public abstract class AbstractEndpoint<S
/**
+ * Process the provided socket with the given current status.
+ *
+ * @param socket The socket to process
+ * @param status The current socket status
+ *
+ * @return The state of the socket after processing
+ */
+ public SocketState process(SocketWrapperBase<S> socket,
+ SocketStatus status);
+
+
+ /**
* Obtain the GlobalRequestProcessor associated with the handler.
*/
public Object getGlobal();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1641289&r1=1641288&r2=1641289&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Sun Nov 23
22:51:27 2014
@@ -130,9 +130,9 @@ public class AprEndpoint extends Abstrac
/**
* Handling of accepted sockets.
*/
- protected Handler handler = null;
- public void setHandler(Handler handler ) { this.handler = handler; }
- public Handler getHandler() { return handler; }
+ protected Handler<Long> handler = null;
+ public void setHandler(Handler<Long> handler ) { this.handler = handler; }
+ public Handler<Long> getHandler() { return handler; }
/**
@@ -2215,19 +2215,6 @@ public class AprEndpoint extends Abstrac
}
- // ------------------------------------------------ Handler Inner Interface
-
-
- /**
- * Bare bones interface used for socket processing. Per thread data is to
be
- * stored in the ThreadWithAttributes extra folders, or alternately in
- * thread local fields.
- */
- public interface Handler extends AbstractEndpoint.Handler {
- public SocketState process(SocketWrapperBase<Long> socket,
- SocketStatus status);
- }
-
// --------------------------------- SocketWithOptionsProcessor Inner Class
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1641289&r1=1641288&r2=1641289&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Sun Nov 23
22:51:27 2014
@@ -1135,9 +1135,7 @@ public class Nio2Endpoint extends Abstra
* stored in the ThreadWithAttributes extra folders, or alternately in
* thread local fields.
*/
- public interface Handler extends AbstractEndpoint.Handler {
- public SocketState process(SocketWrapperBase<Nio2Channel> socket,
- SocketStatus status);
+ public interface Handler extends AbstractEndpoint.Handler<Nio2Channel> {
public void release(SocketWrapperBase<Nio2Channel> socket);
public void closeAll();
public SSLImplementation getSslImplementation();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1641289&r1=1641288&r2=1641289&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sun Nov 23
22:51:27 2014
@@ -1655,9 +1655,7 @@ public class NioEndpoint extends Abstrac
* stored in the ThreadWithAttributes extra folders, or alternately in
* thread local fields.
*/
- public interface Handler extends AbstractEndpoint.Handler {
- public SocketState process(SocketWrapperBase<NioChannel> socket,
- SocketStatus status);
+ public interface Handler extends AbstractEndpoint.Handler<NioChannel> {
public void release(SocketWrapperBase<NioChannel> socket);
public void release(SocketChannel socket);
public SSLImplementation getSslImplementation();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
