Author: markt
Date: Sun Nov 23 22:51:19 2014
New Revision: 1641288
URL: http://svn.apache.org/r1641288
Log:
Pull up protocol field and createProcessor()
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.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
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1641288&r1=1641287&r2=1641288&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Sun Nov 23
22:51:19 2014
@@ -56,6 +56,17 @@ public abstract class AbstractAjpProtoco
}
+ /**
+ * {@inheritDoc}
+ *
+ * Overridden to make getter accessible to other classes in this package.
+ */
+ @Override
+ protected AbstractEndpoint<S> getEndpoint() {
+ return super.getEndpoint();
+ }
+
+
// ------------------------------------------------- AJP specific
properties
// ------------------------------------------ managed in the
ProtocolHandler
@@ -103,6 +114,27 @@ public abstract class AbstractAjpProtoco
protected abstract static class AbstractAjpConnectionHandler<S>
extends AbstractConnectionHandler<S,AjpProcessor<S>> {
+ private final AbstractAjpProtocol<S> proto;
+
+ public AbstractAjpConnectionHandler(AbstractAjpProtocol<S> proto) {
+ this.proto = proto;
+ }
+
+ @Override
+ protected AbstractAjpProtocol<S> getProtocol() {
+ return proto;
+ }
+
+
+ @Override
+ protected AjpProcessor<S> createProcessor() {
+ AjpProcessor<S> processor =
+ new AjpProcessor<>(proto.getPacketSize(),
proto.getEndpoint());
+ proto.configureProcessor(processor);
+ register(processor);
+ return processor;
+ }
+
@Override
protected void initSsl(SocketWrapperBase<S> socket, Processor<S>
processor) {
// NOOP for AJP
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=1641288&r1=1641287&r2=1641288&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:19 2014
@@ -16,7 +16,6 @@
*/
package org.apache.coyote.ajp;
-import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -31,7 +30,6 @@ import org.apache.tomcat.util.net.Socket
*/
public class AjpAprProtocol extends AbstractAjpProtocol<Long> {
-
private static final Log log = LogFactory.getLog(AjpAprProtocol.class);
@Override
@@ -63,7 +61,6 @@ public class AjpAprProtocol extends Abst
// ----------------------------------------------------- Instance Variables
-
/**
* Connection handler for AJP.
*/
@@ -72,7 +69,6 @@ public class AjpAprProtocol extends Abst
// --------------------------------------------------------- Public Methods
-
public int getPollTime() { return
((AprEndpoint)getEndpoint()).getPollTime(); }
public void setPollTime(int pollTime) {
((AprEndpoint)getEndpoint()).setPollTime(pollTime); }
@@ -91,20 +87,12 @@ public class AjpAprProtocol extends Abst
// -------------------------------------- AjpConnectionHandler Inner Class
-
protected static class AjpConnectionHandler
extends AbstractAjpConnectionHandler<Long>
implements Handler {
- protected final AjpAprProtocol proto;
-
public AjpConnectionHandler(AjpAprProtocol proto) {
- this.proto = proto;
- }
-
- @Override
- protected AbstractProtocol<Long> getProtocol() {
- return proto;
+ super(proto);
}
@Override
@@ -123,20 +111,10 @@ public class AjpAprProtocol extends Abst
processor.recycle(isSocketClosing);
recycledProcessors.push(processor);
if (addToPoller) {
- ((AprEndpoint)proto.getEndpoint()).getPoller().add(
+ ((AprEndpoint)getProtocol().getEndpoint()).getPoller().add(
socket.getSocket().longValue(),
- proto.getEndpoint().getKeepAliveTimeout(), true,
false);
+ getProtocol().getEndpoint().getKeepAliveTimeout(),
true, false);
}
}
-
-
- @Override
- protected AjpProcessor<Long> createProcessor() {
- AjpProcessor<Long> processor =
- new AjpProcessor<>(proto.getPacketSize(),
proto.getEndpoint());
- proto.configureProcessor(processor);
- register(processor);
- return processor;
- }
}
}
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=1641288&r1=1641287&r2=1641288&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:19 2014
@@ -18,7 +18,6 @@ package org.apache.coyote.ajp;
import javax.net.ssl.SSLEngine;
-import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -35,7 +34,6 @@ import org.apache.tomcat.util.net.Socket
*/
public class AjpNio2Protocol extends AbstractAjpProtocol<Nio2Channel> {
-
private static final Log log = LogFactory.getLog(AjpNio2Protocol.class);
@Override
@@ -50,7 +48,6 @@ public class AjpNio2Protocol extends Abs
// ------------------------------------------------------------ Constructor
-
public AjpNio2Protocol() {
super(new Nio2Endpoint());
cHandler = new AjpConnectionHandler(this);
@@ -60,7 +57,6 @@ public class AjpNio2Protocol extends Abs
// ----------------------------------------------------- Instance Variables
-
/**
* Connection handler for AJP.
*/
@@ -77,20 +73,12 @@ public class AjpNio2Protocol extends Abs
// -------------------------------------- AjpConnectionHandler Inner Class
-
protected static class AjpConnectionHandler
extends AbstractAjpConnectionHandler<Nio2Channel>
implements Handler {
- protected final AjpNio2Protocol proto;
-
public AjpConnectionHandler(AjpNio2Protocol proto) {
- this.proto = proto;
- }
-
- @Override
- protected AbstractProtocol<Nio2Channel> getProtocol() {
- return proto;
+ super(proto);
}
@Override
@@ -136,22 +124,13 @@ public class AjpNio2Protocol extends Abs
}
@Override
- protected AjpProcessor<Nio2Channel> createProcessor() {
- AjpProcessor<Nio2Channel> processor =
- new AjpProcessor<>(proto.getPacketSize(),
proto.getEndpoint());
- proto.configureProcessor(processor);
- register(processor);
- return processor;
- }
-
- @Override
public void onCreateSSLEngine(SSLEngine engine) {
}
@Override
public void closeAll() {
for (Nio2Channel channel : connections.keySet()) {
- ((Nio2Endpoint)
proto.getEndpoint()).closeSocket(channel.getSocket());
+ ((Nio2Endpoint)
getProtocol().getEndpoint()).closeSocket(channel.getSocket());
}
}
}
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=1641288&r1=1641287&r2=1641288&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:19 2014
@@ -21,7 +21,6 @@ import java.util.Iterator;
import javax.net.ssl.SSLEngine;
-import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -37,7 +36,6 @@ import org.apache.tomcat.util.net.Socket
*/
public class AjpNioProtocol extends AbstractAjpProtocol<NioChannel> {
-
private static final Log log = LogFactory.getLog(AjpNioProtocol.class);
@Override
@@ -52,7 +50,6 @@ public class AjpNioProtocol extends Abst
// ------------------------------------------------------------ Constructor
-
public AjpNioProtocol() {
super(new NioEndpoint());
cHandler = new AjpConnectionHandler(this);
@@ -62,7 +59,6 @@ public class AjpNioProtocol extends Abst
// ----------------------------------------------------- Instance Variables
-
/**
* Connection handler for AJP.
*/
@@ -79,20 +75,12 @@ public class AjpNioProtocol extends Abst
// -------------------------------------- AjpConnectionHandler Inner Class
-
protected static class AjpConnectionHandler
extends AbstractAjpConnectionHandler<NioChannel>
implements Handler {
- protected final AjpNioProtocol proto;
-
public AjpConnectionHandler(AjpNioProtocol proto) {
- this.proto = proto;
- }
-
- @Override
- protected AbstractProtocol<NioChannel> getProtocol() {
- return proto;
+ super(proto);
}
@Override
@@ -163,15 +151,6 @@ public class AjpNioProtocol extends Abst
@Override
- protected AjpProcessor<NioChannel> createProcessor() {
- AjpProcessor<NioChannel> processor =
- new AjpProcessor<>(proto.getPacketSize(),
proto.getEndpoint());
- proto.configureProcessor(processor);
- register(processor);
- return processor;
- }
-
- @Override
public void onCreateSSLEngine(SSLEngine engine) {
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
