Author: markt
Date: Tue Sep 3 10:03:22 2013
New Revision: 1519627
URL: http://svn.apache.org/r1519627
Log:
More side-effects from making endpoints generic
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
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/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.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=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Tue Sep 3
10:03:22 2013
@@ -34,7 +34,7 @@ public abstract class AbstractProcessor<
protected Adapter adapter;
protected final AsyncStateMachine<S> asyncStateMachine;
- protected final AbstractEndpoint endpoint;
+ protected final AbstractEndpoint<S> endpoint;
protected final Request request;
protected final Response response;
protected SocketWrapper<S> socketWrapper = null;
@@ -51,7 +51,7 @@ public abstract class AbstractProcessor<
response = null;
}
- public AbstractProcessor(AbstractEndpoint endpoint) {
+ public AbstractProcessor(AbstractEndpoint<S> endpoint) {
this.endpoint = endpoint;
asyncStateMachine = new AsyncStateMachine<>(this);
@@ -66,7 +66,7 @@ public abstract class AbstractProcessor<
/**
* The endpoint receiving connections that are handled by this processor.
*/
- protected AbstractEndpoint getEndpoint() {
+ protected AbstractEndpoint<S> getEndpoint() {
return endpoint;
}
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Tue Sep 3
10:03:22 2013
@@ -43,7 +43,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 {
/**
@@ -85,7 +85,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
@@ -573,7 +573,7 @@ public abstract class AbstractProtocol i
new RecycledProcessors<>(this);
- protected abstract AbstractProtocol getProtocol();
+ protected abstract AbstractProtocol<S> getProtocol();
@Override
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Tue Sep
3 10:03:22 2013
@@ -237,7 +237,7 @@ public abstract class AbstractAjpProcess
// ------------------------------------------------------------ Constructor
- public AbstractAjpProcessor(int packetSize, AbstractEndpoint endpoint) {
+ public AbstractAjpProcessor(int packetSize, AbstractEndpoint<S> endpoint) {
super(endpoint);
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=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Tue Sep 3
10:03:22 2013
@@ -23,7 +23,7 @@ import org.apache.coyote.Processor;
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/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Tue Sep 3
10:03:22 2013
@@ -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/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Tue Sep 3
10:03:22 2013
@@ -38,7 +38,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);
@@ -99,7 +99,7 @@ public class AjpNioProtocol extends Abst
}
@Override
- protected AbstractProtocol getProtocol() {
+ protected AbstractProtocol<NioChannel> getProtocol() {
return proto;
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Tue Sep 3
10:03:22 2013
@@ -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/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Tue
Sep 3 10:03:22 2013
@@ -239,7 +239,7 @@ public abstract class AbstractHttp11Proc
protected HttpUpgradeHandler httpUpgradeHandler = null;
- public AbstractHttp11Processor(AbstractEndpoint endpoint) {
+ public AbstractHttp11Processor(AbstractEndpoint<S> endpoint) {
super(endpoint);
userDataHelper = new UserDataHelper(getLog());
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Tue
Sep 3 10:03:22 2013
@@ -19,7 +19,7 @@ package org.apache.coyote.http11;
import org.apache.coyote.AbstractProtocol;
-public abstract class AbstractHttp11Protocol<S> extends AbstractProtocol {
+public abstract class AbstractHttp11Protocol<S> extends AbstractProtocol<S> {
@Override
protected String getProtocolName() {
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java Tue Sep
3 10:03:22 2013
@@ -242,7 +242,7 @@ public abstract class AbstractInputBuffe
protected abstract boolean fill(boolean block) throws IOException;
protected abstract void init(SocketWrapper<S> socketWrapper,
- AbstractEndpoint endpoint) throws IOException;
+ AbstractEndpoint<S> endpoint) throws IOException;
protected abstract Log getLog();
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Tue
Sep 3 10:03:22 2013
@@ -386,7 +386,7 @@ public abstract class AbstractOutputBuff
public abstract void init(SocketWrapper<S> socketWrapper,
- AbstractEndpoint endpoint) throws IOException;
+ AbstractEndpoint<S> endpoint) throws IOException;
public abstract void sendAck() throws IOException;
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=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Tue Sep
3 10:03:22 2013
@@ -223,7 +223,7 @@ public class Http11AprProtocol extends A
}
@Override
- protected AbstractProtocol getProtocol() {
+ protected AbstractProtocol<Long> getProtocol() {
return proto;
}
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=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Tue Sep
3 10:03:22 2013
@@ -157,7 +157,7 @@ public class Http11NioProtocol extends A
}
@Override
- protected AbstractProtocol getProtocol() {
+ protected AbstractProtocol<NioChannel> getProtocol() {
return proto;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Tue Sep 3
10:03:22 2013
@@ -120,7 +120,7 @@ public class Http11Protocol extends Abst
}
@Override
- protected AbstractProtocol getProtocol() {
+ protected AbstractProtocol<Socket> getProtocol() {
return proto;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Tue
Sep 3 10:03:22 2013
@@ -546,7 +546,7 @@ public class InternalAprInputBuffer exte
@Override
protected void init(SocketWrapper<Long> socketWrapper,
- AbstractEndpoint endpoint) throws IOException {
+ AbstractEndpoint<Long> endpoint) throws IOException {
socket = socketWrapper.getSocket().longValue();
wrapper = socketWrapper;
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Tue
Sep 3 10:03:22 2013
@@ -83,14 +83,14 @@ public class InternalAprOutputBuffer ext
private volatile boolean flipped = false;
- private AbstractEndpoint endpoint;
+ private AbstractEndpoint<Long> endpoint;
// --------------------------------------------------------- Public Methods
@Override
public void init(SocketWrapper<Long> socketWrapper,
- AbstractEndpoint endpoint) throws IOException {
+ AbstractEndpoint<Long> endpoint) throws IOException {
wrapper = socketWrapper;
socket = socketWrapper.getSocket().longValue();
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java Tue Sep
3 10:03:22 2013
@@ -466,7 +466,7 @@ public class InternalInputBuffer extends
@Override
protected void init(SocketWrapper<Socket> socketWrapper,
- AbstractEndpoint endpoint) throws IOException {
+ AbstractEndpoint<Socket> endpoint) throws IOException {
inputStream = socketWrapper.getSocket().getInputStream();
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Tue
Sep 3 10:03:22 2013
@@ -755,7 +755,7 @@ public class InternalNioInputBuffer exte
@Override
protected void init(SocketWrapper<NioChannel> socketWrapper,
- AbstractEndpoint endpoint) throws IOException {
+ AbstractEndpoint<NioChannel> endpoint) throws IOException {
socket = socketWrapper.getSocket();
if (socket == null) {
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Tue
Sep 3 10:03:22 2013
@@ -73,7 +73,7 @@ public class InternalNioOutputBuffer ext
@Override
public void init(SocketWrapper<NioChannel> socketWrapper,
- AbstractEndpoint endpoint) throws IOException {
+ AbstractEndpoint<NioChannel> endpoint) throws IOException {
socket = socketWrapper.getSocket();
pool = ((NioEndpoint)endpoint).getSelectorPool();
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java Tue
Sep 3 10:03:22 2013
@@ -87,7 +87,7 @@ public class InternalOutputBuffer extend
@Override
public void init(SocketWrapper<Socket> socketWrapper,
- AbstractEndpoint endpoint) throws IOException {
+ AbstractEndpoint<Socket> endpoint) throws IOException {
outputStream = socketWrapper.getSocket().getOutputStream();
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java Tue Sep 3
10:03:22 2013
@@ -46,7 +46,7 @@ public interface NpnHandler<S> {
* @param sslContext
* @param adapter
*/
- public void init(final AbstractEndpoint ep, long sslContext, Adapter
adapter);
+ public void init(final AbstractEndpoint<S> ep, long sslContext, Adapter
adapter);
/**
* Called when a SSLSocket or SSLEngine are first used, to initialize
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java?rev=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java Tue Sep 3
10:03:22 2013
@@ -65,7 +65,7 @@ public class SpdyAprNpnHandler implement
private SpdyContext spdyContext;
@Override
- public void init(final AbstractEndpoint ep, long sslContext,
+ public void init(final AbstractEndpoint<Long> ep, long sslContext,
final Adapter adapter) {
spdyContext = new SpdyContext();
if (sslContext == 0) {
@@ -82,7 +82,7 @@ public class SpdyAprNpnHandler implement
@Override
public void onStream(SpdyConnection con, SpdyStream ch)
throws IOException {
- SpdyProcessor sp = new SpdyProcessor(con, ep);
+ SpdyProcessor<Long> sp = new SpdyProcessor<>(con, ep);
sp.setAdapter(adapter);
sp.onSynStream(ch);
}
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=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java Tue Sep 3
10:03:22 2013
@@ -54,7 +54,7 @@ import org.apache.tomcat.util.net.Socket
*
* Based on the AJP processor.
*/
-public class SpdyProcessor extends AbstractProcessor<Object> implements
+public class SpdyProcessor<S> extends AbstractProcessor<S> implements
Runnable {
// TODO: handle input
@@ -80,7 +80,7 @@ public class SpdyProcessor extends Abstr
private boolean outCommit = false;
- public SpdyProcessor(SpdyConnection spdy, AbstractEndpoint endpoint) {
+ public SpdyProcessor(SpdyConnection spdy, AbstractEndpoint<S> endpoint) {
super(endpoint);
this.spdy = spdy;
@@ -469,7 +469,7 @@ public class SpdyProcessor extends Abstr
}
@Override
- public SocketState process(SocketWrapper<Object> socket)
+ public SocketState process(SocketWrapper<S> socket)
throws IOException {
throw new IOException("Unimplemented");
}
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=1519627&r1=1519626&r2=1519627&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java Tue Sep 3
10:03:22 2013
@@ -49,7 +49,7 @@ import org.apache.tomcat.util.net.Socket
* TODO: if spdy->spdy proxy, info about original spdy stream for pushes.
*
*/
-public class SpdyProxyProtocol extends AbstractProtocol {
+public class SpdyProxyProtocol extends AbstractProtocol<Socket> {
private static final Log log = LogFactory.getLog(SpdyProxyProtocol.class);
private final JIoEndpoint.Handler cHandler = new TomcatJioHandler();
@@ -93,7 +93,7 @@ public class SpdyProxyProtocol extends A
spdyContext.setHandler(new SpdyHandler() {
@Override
public void onStream(SpdyConnection con, SpdyStream ch) throws
IOException {
- SpdyProcessor sp = new SpdyProcessor(con, endpoint);
+ SpdyProcessor<Socket> sp = new SpdyProcessor<>(con, endpoint);
sp.setAdapter(getAdapter());
sp.onSynStream(ch);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
