Author: markt
Date: Fri Jun 13 19:33:43 2014
New Revision: 1602507
URL: http://svn.apache.org/r1602507
Log:
Another Endpoint generics related backport.
Original message:
More side-effects from making endpoints generic
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1519627
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1602507&r1=1602506&r2=1602507&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Jun
13 19:33:43 2014
@@ -40,7 +40,7 @@ import org.apache.tomcat.util.net.Socket
import org.apache.tomcat.util.net.SocketWrapper;
import org.apache.tomcat.util.res.StringManager;
-public abstract class AbstractProtocol implements ProtocolHandler,
+public abstract class AbstractProtocol<S> implements ProtocolHandler,
MBeanRegistration {
/**
@@ -82,7 +82,7 @@ public abstract class AbstractProtocol i
* ProtocolHandler implementation (ProtocolHandler using BIO, requires BIO
* Endpoint etc.).
*/
- protected AbstractEndpoint endpoint = null;
+ protected AbstractEndpoint<S> endpoint = null;
// ----------------------------------------------- Generic property
handling
@@ -540,7 +540,7 @@ public abstract class AbstractProtocol i
new RecycledProcessors<P,S>(this);
- protected abstract AbstractProtocol getProtocol();
+ protected abstract AbstractProtocol<S> getProtocol();
@Override
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1602507&r1=1602506&r2=1602507&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
Fri Jun 13 19:33:43 2014
@@ -22,7 +22,7 @@ import org.apache.coyote.http11.upgrade.
import org.apache.tomcat.util.net.SocketWrapper;
import org.apache.tomcat.util.res.StringManager;
-public abstract class AbstractAjpProtocol extends AbstractProtocol {
+public abstract class AbstractAjpProtocol<S> extends AbstractProtocol<S> {
/**
* The string manager for this package.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1602507&r1=1602506&r2=1602507&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Fri Jun
13 19:33:43 2014
@@ -34,7 +34,7 @@ import org.apache.tomcat.util.net.Socket
* @author Remy Maucherat
* @author Costin Manolache
*/
-public class AjpAprProtocol extends AbstractAjpProtocol {
+public class AjpAprProtocol extends AbstractAjpProtocol<Long> {
private static final Log log = LogFactory.getLog(AjpAprProtocol.class);
@@ -113,7 +113,7 @@ public class AjpAprProtocol extends Abst
}
@Override
- protected AbstractProtocol getProtocol() {
+ protected AbstractProtocol<Long> getProtocol() {
return proto;
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1602507&r1=1602506&r2=1602507&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Fri Jun
13 19:33:43 2014
@@ -36,7 +36,7 @@ import org.apache.tomcat.util.net.Socket
* Processor is single threaded and specific to stream-based protocols,
* will not fit Jk protocols like JNI.
*/
-public class AjpNioProtocol extends AbstractAjpProtocol {
+public class AjpNioProtocol extends AbstractAjpProtocol<NioChannel> {
private static final Log log = LogFactory.getLog(AjpNioProtocol.class);
@@ -97,7 +97,7 @@ public class AjpNioProtocol extends Abst
}
@Override
- protected AbstractProtocol getProtocol() {
+ protected AbstractProtocol<NioChannel> getProtocol() {
return proto;
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=1602507&r1=1602506&r2=1602507&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Fri Jun 13
19:33:43 2014
@@ -37,7 +37,7 @@ import org.apache.tomcat.util.net.Socket
* @author Remy Maucherat
* @author Costin Manolache
*/
-public class AjpProtocol extends AbstractAjpProtocol {
+public class AjpProtocol extends AbstractAjpProtocol<Socket> {
private static final Log log = LogFactory.getLog(AjpProtocol.class);
@@ -96,7 +96,7 @@ public class AjpProtocol extends Abstrac
}
@Override
- protected AbstractProtocol getProtocol() {
+ protected AbstractProtocol<Socket> getProtocol() {
return proto;
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java?rev=1602507&r1=1602506&r2=1602507&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
Fri Jun 13 19:33:43 2014
@@ -18,8 +18,8 @@ package org.apache.coyote.http11;
import org.apache.tomcat.util.net.SSLImplementation;
-public abstract class AbstractHttp11JsseProtocol
- extends AbstractHttp11Protocol {
+public abstract class AbstractHttp11JsseProtocol<S>
+ extends AbstractHttp11Protocol<S> {
protected SSLImplementation sslImplementation = null;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1602507&r1=1602506&r2=1602507&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Fri Jun 13 19:33:43 2014
@@ -20,7 +20,7 @@ package org.apache.coyote.http11;
import org.apache.coyote.AbstractProtocol;
import org.apache.tomcat.util.res.StringManager;
-public abstract class AbstractHttp11Protocol extends AbstractProtocol {
+public abstract class AbstractHttp11Protocol<S> extends AbstractProtocol<S> {
/**
* The string manager for this package.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1602507&r1=1602506&r2=1602507&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Fri Jun 13 19:33:43 2014
@@ -40,7 +40,7 @@ import org.apache.tomcat.util.net.Socket
* @author Remy Maucherat
* @author Costin Manolache
*/
-public class Http11AprProtocol extends AbstractHttp11Protocol {
+public class Http11AprProtocol extends AbstractHttp11Protocol<Long> {
private static final Log log = LogFactory.getLog(Http11AprProtocol.class);
@@ -215,7 +215,7 @@ public class Http11AprProtocol extends A
}
@Override
- protected AbstractProtocol getProtocol() {
+ protected AbstractProtocol<Long> getProtocol() {
return proto;
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1602507&r1=1602506&r2=1602507&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Fri Jun 13 19:33:43 2014
@@ -44,7 +44,7 @@ import org.apache.tomcat.util.net.Socket
* @author Costin Manolache
* @author Filip Hanik
*/
-public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
+public class Http11NioProtocol extends AbstractHttp11JsseProtocol<NioChannel> {
private static final Log log = LogFactory.getLog(Http11NioProtocol.class);
@@ -147,7 +147,7 @@ public class Http11NioProtocol extends A
}
@Override
- protected AbstractProtocol getProtocol() {
+ protected AbstractProtocol<NioChannel> getProtocol() {
return proto;
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1602507&r1=1602506&r2=1602507&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java Fri
Jun 13 19:33:43 2014
@@ -39,7 +39,7 @@ import org.apache.tomcat.util.net.Socket
* @author Remy Maucherat
* @author Costin Manolache
*/
-public class Http11Protocol extends AbstractHttp11JsseProtocol {
+public class Http11Protocol extends AbstractHttp11JsseProtocol<Socket> {
private static final org.apache.juli.logging.Log log
@@ -110,7 +110,7 @@ public class Http11Protocol extends Abst
}
@Override
- protected AbstractProtocol getProtocol() {
+ protected AbstractProtocol<Socket> getProtocol() {
return proto;
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=1602507&r1=1602506&r2=1602507&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
Fri Jun 13 19:33:43 2014
@@ -82,7 +82,7 @@ public class InternalAprOutputBuffer ext
*/
private ByteBuffer bbuf = null;
-
+
// --------------------------------------------------------- Public Methods
@Override
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java?rev=1602507&r1=1602506&r2=1602507&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java Fri
Jun 13 19:33:43 2014
@@ -107,7 +107,7 @@ public class TestCustomSsl extends Tomca
// Override the defaults
ProtocolHandler handler = tomcat.getConnector().getProtocolHandler();
if (handler instanceof AbstractHttp11JsseProtocol) {
- ((AbstractHttp11JsseProtocol) handler).setTruststoreFile(null);
+ ((AbstractHttp11JsseProtocol<?>) handler).setTruststoreFile(null);
} else {
// Unexpected
fail("Unexpected handler type");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
