Author: markt
Date: Sun Nov 23 22:51:33 2014
New Revision: 1641290
URL: http://svn.apache.org/r1641290
Log:
Pull up the Handler instance
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
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1641290&r1=1641289&r2=1641290&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 23
22:51:33 2014
@@ -89,6 +89,8 @@ public abstract class AbstractProtocol<S
*/
private final AbstractEndpoint<S> endpoint;
+ private Handler<S> handler;
+
public AbstractProtocol(AbstractEndpoint<S> endpoint) {
this.endpoint = endpoint;
@@ -320,6 +322,15 @@ public abstract class AbstractProtocol<S
}
+ protected Handler<S> getHandler() {
+ return handler;
+ }
+
+ protected void setHandler(Handler<S> handler) {
+ this.handler = handler;
+ }
+
+
// -------------------------------------------------------- Abstract
methods
/**
@@ -342,12 +353,6 @@ public abstract class AbstractProtocol<S
protected abstract String getProtocolName();
- /**
- * Obtain the handler associated with the underlying Endpoint
- */
- protected abstract Handler<S> getHandler();
-
-
// ----------------------------------------------------- JMX related
methods
protected String domain;
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=1641290&r1=1641289&r2=1641290&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:33 2014
@@ -19,7 +19,6 @@ package org.apache.coyote.ajp;
import org.apache.coyote.Processor;
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.SocketWrapperBase;
@@ -36,12 +35,6 @@ public class AjpAprProtocol extends Abst
@Override
- protected AbstractEndpoint.Handler<Long> getHandler() {
- return cHandler;
- }
-
-
- @Override
public boolean isAprRequired() {
// Override since this protocol implementation requires the APR/native
// library
@@ -53,19 +46,12 @@ public class AjpAprProtocol extends Abst
public AjpAprProtocol() {
super(new AprEndpoint());
- cHandler = new AjpConnectionHandler(this);
+ AjpConnectionHandler cHandler = new AjpConnectionHandler(this);
+ setHandler(cHandler);
((AprEndpoint) getEndpoint()).setHandler(cHandler);
}
- // ----------------------------------------------------- Instance Variables
-
- /**
- * Connection handler for AJP.
- */
- private final AjpConnectionHandler cHandler;
-
-
// --------------------------------------------------------- Public Methods
public int getPollTime() { return
((AprEndpoint)getEndpoint()).getPollTime(); }
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=1641290&r1=1641289&r2=1641290&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:33 2014
@@ -21,7 +21,6 @@ import javax.net.ssl.SSLEngine;
import org.apache.coyote.Processor;
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.Nio2Channel;
import org.apache.tomcat.util.net.Nio2Endpoint;
import org.apache.tomcat.util.net.Nio2Endpoint.Handler;
@@ -40,29 +39,16 @@ public class AjpNio2Protocol extends Abs
protected Log getLog() { return log; }
- @Override
- protected AbstractEndpoint.Handler<Nio2Channel> getHandler() {
- return cHandler;
- }
-
-
// ------------------------------------------------------------ Constructor
public AjpNio2Protocol() {
super(new Nio2Endpoint());
- cHandler = new AjpConnectionHandler(this);
+ AjpConnectionHandler cHandler = new AjpConnectionHandler(this);
+ setHandler(cHandler);
((Nio2Endpoint) getEndpoint()).setHandler(cHandler);
}
- // ----------------------------------------------------- Instance Variables
-
- /**
- * Connection handler for AJP.
- */
- private final AjpConnectionHandler cHandler;
-
-
// ----------------------------------------------------- JMX related
methods
@Override
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=1641290&r1=1641289&r2=1641290&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:33 2014
@@ -24,7 +24,6 @@ import javax.net.ssl.SSLEngine;
import org.apache.coyote.Processor;
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.NioChannel;
import org.apache.tomcat.util.net.NioEndpoint;
import org.apache.tomcat.util.net.NioEndpoint.Handler;
@@ -42,29 +41,16 @@ public class AjpNioProtocol extends Abst
protected Log getLog() { return log; }
- @Override
- protected AbstractEndpoint.Handler<NioChannel> getHandler() {
- return cHandler;
- }
-
-
// ------------------------------------------------------------ Constructor
public AjpNioProtocol() {
super(new NioEndpoint());
- cHandler = new AjpConnectionHandler(this);
+ AjpConnectionHandler cHandler = new AjpConnectionHandler(this);
+ setHandler(cHandler);
((NioEndpoint) getEndpoint()).setHandler(cHandler);
}
- // ----------------------------------------------------- Instance Variables
-
- /**
- * Connection handler for AJP.
- */
- private final AjpConnectionHandler cHandler;
-
-
// ----------------------------------------------------- JMX related
methods
@Override
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=1641290&r1=1641289&r2=1641290&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:33 2014
@@ -26,7 +26,6 @@ import org.apache.coyote.Processor;
import org.apache.coyote.http11.upgrade.UpgradeProcessor;
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.Poller;
import org.apache.tomcat.util.net.SocketStatus;
@@ -45,15 +44,16 @@ public class Http11AprProtocol extends A
private static final Log log = LogFactory.getLog(Http11AprProtocol.class);
- @Override
- protected Log getLog() { return log; }
+ public Http11AprProtocol() {
+ super(new AprEndpoint());
+ Http11ConnectionHandler cHandler = new Http11ConnectionHandler(this);
+ setHandler(cHandler);
+ ((AprEndpoint) getEndpoint()).setHandler(cHandler);
+ }
@Override
- protected AbstractEndpoint.Handler<Long> getHandler() {
- return cHandler;
- }
-
+ protected Log getLog() { return log; }
@Override
public boolean isAprRequired() {
@@ -62,15 +62,6 @@ public class Http11AprProtocol extends A
return true;
}
-
- public Http11AprProtocol() {
- super(new AprEndpoint());
- cHandler = new Http11ConnectionHandler(this);
- ((AprEndpoint) getEndpoint()).setHandler(cHandler);
- }
-
- private final Http11ConnectionHandler cHandler;
-
public boolean getUseSendfile() { return getEndpoint().getUseSendfile(); }
public void setUseSendfile(boolean useSendfile) {
((AprEndpoint)getEndpoint()).setUseSendfile(useSendfile); }
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=1641290&r1=1641289&r2=1641290&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:33 2014
@@ -28,7 +28,6 @@ import org.apache.coyote.Processor;
import org.apache.coyote.http11.upgrade.UpgradeProcessor;
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.Nio2Channel;
import org.apache.tomcat.util.net.Nio2Endpoint;
import org.apache.tomcat.util.net.Nio2Endpoint.Handler;
@@ -47,24 +46,19 @@ public class Http11Nio2Protocol extends
private static final Log log = LogFactory.getLog(Http11Nio2Protocol.class);
- @Override
- protected Log getLog() { return log; }
-
-
- @Override
- protected AbstractEndpoint.Handler<Nio2Channel> getHandler() {
- return cHandler;
- }
-
-
public Http11Nio2Protocol() {
super(new Nio2Endpoint());
- cHandler = new Http11ConnectionHandler(this);
+ Http11ConnectionHandler cHandler = new Http11ConnectionHandler(this);
+ setHandler(cHandler);
((Nio2Endpoint) getEndpoint()).setHandler(cHandler);
}
@Override
+ protected Log getLog() { return log; }
+
+
+ @Override
public void start() throws Exception {
super.start();
if (npnHandler != null) {
@@ -72,9 +66,6 @@ public class Http11Nio2Protocol extends
}
}
- // -------------------- Properties--------------------
-
- private final Http11ConnectionHandler cHandler;
// -------------------- Pool setup --------------------
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=1641290&r1=1641289&r2=1641290&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:33 2014
@@ -29,7 +29,6 @@ import org.apache.coyote.Processor;
import org.apache.coyote.http11.upgrade.UpgradeProcessor;
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.NioChannel;
import org.apache.tomcat.util.net.NioEndpoint;
import org.apache.tomcat.util.net.NioEndpoint.Handler;
@@ -52,24 +51,19 @@ public class Http11NioProtocol extends A
private static final Log log = LogFactory.getLog(Http11NioProtocol.class);
- @Override
- protected Log getLog() { return log; }
-
-
- @Override
- protected AbstractEndpoint.Handler<NioChannel> getHandler() {
- return cHandler;
- }
-
-
public Http11NioProtocol() {
super(new NioEndpoint());
- cHandler = new Http11ConnectionHandler(this);
+ Http11ConnectionHandler cHandler = new Http11ConnectionHandler(this);
+ setHandler(cHandler);
((NioEndpoint) getEndpoint()).setHandler(cHandler);
}
@Override
+ protected Log getLog() { return log; }
+
+
+ @Override
public void start() throws Exception {
super.start();
if (npnHandler != null) {
@@ -77,9 +71,6 @@ public class Http11NioProtocol extends A
}
}
- // -------------------- Properties--------------------
-
- private final Http11ConnectionHandler cHandler;
// -------------------- Pool setup --------------------
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=1641290&r1=1641289&r2=1641290&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:33 2014
@@ -30,7 +30,6 @@ import org.apache.tomcat.spdy.SpdyConnec
import org.apache.tomcat.spdy.SpdyContext;
import org.apache.tomcat.spdy.SpdyContext.SpdyHandler;
import org.apache.tomcat.spdy.SpdyStream;
-import org.apache.tomcat.util.net.AbstractEndpoint.Handler;
import org.apache.tomcat.util.net.NioChannel;
import org.apache.tomcat.util.net.NioEndpoint;
import org.apache.tomcat.util.net.SSLImplementation;
@@ -60,13 +59,13 @@ import org.apache.tomcat.util.net.Socket
public class SpdyProxyProtocol extends AbstractProtocol<NioChannel> {
private static final Log log = LogFactory.getLog(SpdyProxyProtocol.class);
- private final NioEndpoint.Handler cHandler = new TomcatNioHandler();
private SpdyContext spdyContext;
private boolean compress = false;
public SpdyProxyProtocol() {
super(new NioEndpoint());
+ NioEndpoint.Handler cHandler = new TomcatNioHandler();
((NioEndpoint) getEndpoint()).setHandler(cHandler);
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
}
@@ -87,11 +86,6 @@ public class SpdyProxyProtocol extends A
}
@Override
- protected Handler<NioChannel> getHandler() {
- return cHandler;
- }
-
- @Override
public void start() throws Exception {
super.start();
spdyContext = new SpdyContext();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
