You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/01/16 13:15:13 UTC
svn commit: r1652395 - in /tomcat/trunk/java/org/apache/coyote: ./ ajp/
http11/ http11/upgrade/ spdy/
Author: markt
Date: Fri Jan 16 12:15:12 2015
New Revision: 1652395
URL: http://svn.apache.org/r1652395
Log:
Remove unused code.
Modified:
tomcat/trunk/java/org/apache/coyote/Processor.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/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.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/http11/upgrade/UpgradeProcessor.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Processor.java?rev=1652395&r1=1652394&r2=1652395&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Processor.java Fri Jan 16 12:15:12 2015
@@ -49,7 +49,11 @@ public interface Processor<S> {
Request getRequest();
- void recycle(boolean socketClosing);
+ /**
+ * Recycle the processor, ready for the next request which may be on the
+ * same connection or a different connection.
+ */
+ void recycle();
void setSslSupport(SSLSupport sslSupport);
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=1652395&r1=1652394&r2=1652395&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Fri Jan 16 12:15:12 2015
@@ -92,7 +92,7 @@ public class AjpAprProtocol extends Abst
public void release(SocketWrapperBase<Long> socket,
Processor<Long> processor, boolean isSocketClosing,
boolean addToPoller) {
- processor.recycle(isSocketClosing);
+ processor.recycle();
recycledProcessors.push(processor);
if (addToPoller) {
((AprEndpoint)getProtocol().getEndpoint()).getPoller().add(
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=1652395&r1=1652394&r2=1652395&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Fri Jan 16 12:15:12 2015
@@ -87,7 +87,7 @@ public class AjpNio2Protocol extends Abs
Processor<Nio2Channel> processor =
connections.remove(socket.getSocket());
if (processor != null) {
- processor.recycle(true);
+ processor.recycle();
recycledProcessors.push(processor);
}
}
@@ -105,7 +105,7 @@ public class AjpNio2Protocol extends Abs
"], isSocketClosing: [" + isSocketClosing +
"], addToPoller: [" + addToPoller + "]");
}
- processor.recycle(isSocketClosing);
+ processor.recycle();
recycledProcessors.push(processor);
}
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=1652395&r1=1652394&r2=1652395&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Fri Jan 16 12:15:12 2015
@@ -95,7 +95,7 @@ public class AjpNioProtocol extends Abst
if (entry.getKey().getIOChannel()==socket) {
it.remove();
Processor<NioChannel> result = entry.getValue();
- result.recycle(true);
+ result.recycle();
unregister(result);
released = true;
break;
@@ -115,7 +115,7 @@ public class AjpNioProtocol extends Abst
Processor<NioChannel> processor =
connections.remove(socket.getSocket());
if (processor != null) {
- processor.recycle(true);
+ processor.recycle();
recycledProcessors.push(processor);
}
}
@@ -128,7 +128,7 @@ public class AjpNioProtocol extends Abst
public void release(SocketWrapperBase<NioChannel> socket,
Processor<NioChannel> processor, boolean isSocketClosing,
boolean addToPoller) {
- processor.recycle(isSocketClosing);
+ processor.recycle();
recycledProcessors.push(processor);
if (addToPoller) {
socket.getSocket().getPoller().add(socket.getSocket());
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1652395&r1=1652394&r2=1652395&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Jan 16 12:15:12 2015
@@ -731,7 +731,7 @@ public class AjpProcessor<S> extends Abs
int type = requestHeaderMessage.getByte();
if (type == Constants.JK_AJP13_CPING_REQUEST) {
if (endpoint.isPaused()) {
- recycle(true);
+ recycle();
break;
}
cping = true;
@@ -741,7 +741,7 @@ public class AjpProcessor<S> extends Abs
} catch (IOException e) {
setErrorState(ErrorState.CLOSE_NOW, e);
}
- recycle(false);
+ recycle();
continue;
} else if(type != Constants.JK_AJP13_FORWARD_REQUEST) {
// Unexpected packet type. Unread body packets should have
@@ -833,7 +833,7 @@ public class AjpProcessor<S> extends Abs
socketWrapper.setTimeout(keepAliveTimeout);
}
- recycle(false);
+ recycle();
}
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
@@ -874,16 +874,8 @@ public class AjpProcessor<S> extends Abs
}
- /**
- * Recycle the processor, ready for the next request which may be on the
- * same connection or a different connection.
- *
- * @param socketClosing Indicates if the socket is about to be closed
- * allowing the processor to perform any additional
- * clean-up that may be required
- */
@Override
- public void recycle(boolean socketClosing) {
+ public void recycle() {
getAdapter().checkRecycled(request, response);
asyncStateMachine.recycle();
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=1652395&r1=1652394&r2=1652395&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Fri Jan 16 12:15:12 2015
@@ -1776,7 +1776,7 @@ public abstract class AbstractHttp11Proc
@Override
- public final void recycle(boolean isSocketClosing) {
+ public final void recycle() {
getAdapter().checkRecycled(request, response);
if (getInputBuffer() != null) {
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=1652395&r1=1652394&r2=1652395&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Fri Jan 16 12:15:12 2015
@@ -242,7 +242,7 @@ public class Http11AprProtocol extends A
public void release(SocketWrapperBase<Long> socket,
Processor<Long> processor, boolean isSocketClosing,
boolean addToPoller) {
- processor.recycle(isSocketClosing);
+ processor.recycle();
recycledProcessors.push(processor);
if (addToPoller && proto.getEndpoint().isRunning()) {
((AprEndpoint)proto.getEndpoint()).getPoller().add(
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=1652395&r1=1652394&r2=1652395&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Fri Jan 16 12:15:12 2015
@@ -134,7 +134,7 @@ public class Http11Nio2Protocol extends
Processor<Nio2Channel> processor =
connections.remove(socket.getSocket());
if (processor != null) {
- processor.recycle(true);
+ processor.recycle();
recycledProcessors.push(processor);
}
}
@@ -165,7 +165,7 @@ public class Http11Nio2Protocol extends
public void release(SocketWrapperBase<Nio2Channel> socket,
Processor<Nio2Channel> processor, boolean isSocketClosing,
boolean addToPoller) {
- processor.recycle(isSocketClosing);
+ processor.recycle();
recycledProcessors.push(processor);
if (socket.isAsync()) {
((Nio2Endpoint) proto.getEndpoint()).removeTimeout(socket);
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=1652395&r1=1652394&r2=1652395&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Fri Jan 16 12:15:12 2015
@@ -167,7 +167,7 @@ public class Http11NioProtocol extends A
if (entry.getKey().getIOChannel()==socket) {
it.remove();
Processor<NioChannel> result = entry.getValue();
- result.recycle(true);
+ result.recycle();
unregister(result);
released = true;
break;
@@ -186,7 +186,7 @@ public class Http11NioProtocol extends A
Processor<NioChannel> processor =
connections.remove(socket.getSocket());
if (processor != null) {
- processor.recycle(true);
+ processor.recycle();
recycledProcessors.push(processor);
}
}
@@ -217,7 +217,7 @@ public class Http11NioProtocol extends A
public void release(SocketWrapperBase<NioChannel> socket,
Processor<NioChannel> processor, boolean isSocketClosing,
boolean addToPoller) {
- processor.recycle(isSocketClosing);
+ processor.recycle();
recycledProcessors.push(processor);
if (addToPoller) {
socket.getSocket().getPoller().add(socket.getSocket());
Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java?rev=1652395&r1=1652394&r2=1652395&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java Fri Jan 16 12:15:12 2015
@@ -125,7 +125,7 @@ public class UpgradeProcessor<S> impleme
@Override
- public final void recycle(boolean socketClosing) {
+ public final void recycle() {
// Currently a NO-OP as upgrade processors are not recycled.
}
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=1652395&r1=1652394&r2=1652395&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java Fri Jan 16 12:15:12 2015
@@ -616,7 +616,7 @@ public class SpdyProcessor<S> extends Ab
}
@Override
- public void recycle(boolean socketClosing) {
+ public void recycle() {
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org