Author: markt
Date: Fri Jan 16 12:15:18 2015
New Revision: 1652396
URL: http://svn.apache.org/r1652396
Log:
Remove unused code.
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
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1652396&r1=1652395&r2=1652396&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Jan 16
12:15:18 2015
@@ -673,7 +673,7 @@ public abstract class AbstractProtocol<S
// Retrieve leftover input
ByteBuffer leftoverInput =
processor.getLeftoverInput();
// Release the Http11 processor to be re-used
- release(wrapper, processor, false, false);
+ release(wrapper, processor, false);
// Create the upgrade processor
processor = createUpgradeProcessor(
wrapper, leftoverInput, httpUpgradeHandler);
@@ -713,13 +713,13 @@ public abstract class AbstractProtocol<S
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
connections.remove(socket);
- release(wrapper, processor, false, true);
+ release(wrapper, processor, true);
} else if (state == SocketState.SENDFILE) {
// Sendfile in progress. If it fails, the socket will be
// closed. If it works, the socket will be re-added to the
// poller
connections.remove(socket);
- release(wrapper, processor, false, false);
+ release(wrapper, processor, false);
} else if (state == SocketState.UPGRADED) {
// Don't add sockets back to the poller if this was a
// non-blocking write otherwise the poller may trigger
@@ -736,7 +736,7 @@ public abstract class AbstractProtocol<S
if (processor.isUpgrade()) {
processor.getHttpUpgradeHandler().destroy();
} else {
- release(wrapper, processor, true, false);
+ release(wrapper, processor, false);
}
}
return state;
@@ -768,7 +768,7 @@ public abstract class AbstractProtocol<S
connections.remove(socket);
// Don't try to add upgrade processors back into the pool
if (processor !=null && !processor.isUpgrade()) {
- release(wrapper, processor, true, false);
+ release(wrapper, processor, false);
}
return SocketState.CLOSED;
}
@@ -778,9 +778,20 @@ public abstract class AbstractProtocol<S
Processor<S> processor);
protected abstract void longPoll(SocketWrapperBase<S> socket,
Processor<S> processor);
+
+ /**
+ * Expected to be used by the handler once the processor is no longer
+ * required.
+ *
+ * @param socket Socket being released (that was associated with the
+ * processor)
+ * @param processor Processor being released (that was associated with
+ * the socket)
+ * @param addToPoller Should the socket be added to the poller for
+ * reading
+ */
protected abstract void release(SocketWrapperBase<S> socket,
- Processor<S> processor, boolean socketClosing,
- boolean addToPoller);
+ Processor<S> processor, boolean addToPoller);
protected abstract Processor<S> createUpgradeProcessor(
SocketWrapperBase<S> socket, ByteBuffer leftoverInput,
HttpUpgradeHandler httpUpgradeHandler) throws IOException;
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=1652396&r1=1652395&r2=1652396&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:18 2015
@@ -84,14 +84,9 @@ public class AjpAprProtocol extends Abst
return log;
}
- /**
- * Expected to be used by the handler once the processor is no longer
- * required.
- */
@Override
public void release(SocketWrapperBase<Long> socket,
- Processor<Long> processor, boolean isSocketClosing,
- boolean addToPoller) {
+ Processor<Long> processor, boolean addToPoller) {
processor.recycle();
recycledProcessors.push(processor);
if (addToPoller) {
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=1652396&r1=1652395&r2=1652396&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:18 2015
@@ -92,17 +92,11 @@ public class AjpNio2Protocol extends Abs
}
}
- /**
- * Expected to be used by the handler once the processor is no longer
- * required.
- */
@Override
public void release(SocketWrapperBase<Nio2Channel> socket,
- Processor<Nio2Channel> processor, boolean isSocketClosing,
- boolean addToPoller) {
+ Processor<Nio2Channel> processor, boolean addToPoller) {
if (getLog().isDebugEnabled()) {
log.debug("Socket: [" + socket + "], Processor: [" + processor
+
- "], isSocketClosing: [" + isSocketClosing +
"], addToPoller: [" + addToPoller + "]");
}
processor.recycle();
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=1652396&r1=1652395&r2=1652396&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:18 2015
@@ -106,6 +106,7 @@ public class AjpNioProtocol extends Abst
socket, Boolean.valueOf(released)));
}
+
/**
* Expected to be used by the Poller to release resources on socket
* close, errors etc.
@@ -120,14 +121,10 @@ public class AjpNioProtocol extends Abst
}
}
- /**
- * Expected to be used by the handler once the processor is no longer
- * required.
- */
+
@Override
public void release(SocketWrapperBase<NioChannel> socket,
- Processor<NioChannel> processor, boolean isSocketClosing,
- boolean addToPoller) {
+ Processor<NioChannel> processor, boolean addToPoller) {
processor.recycle();
recycledProcessors.push(processor);
if (addToPoller) {
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=1652396&r1=1652395&r2=1652396&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:18 2015
@@ -229,19 +229,9 @@ public class Http11AprProtocol extends A
return log;
}
- /**
- * Expected to be used by the handler once the processor is no longer
- * required.
- *
- * @param socket
- * @param processor
- * @param isSocketClosing Not used in HTTP
- * @param addToPoller
- */
@Override
public void release(SocketWrapperBase<Long> socket,
- Processor<Long> processor, boolean isSocketClosing,
- boolean addToPoller) {
+ Processor<Long> processor, boolean addToPoller) {
processor.recycle();
recycledProcessors.push(processor);
if (addToPoller && proto.getEndpoint().isRunning()) {
@@ -291,7 +281,7 @@ public class Http11AprProtocol extends A
Poller p = ((AprEndpoint) proto.getEndpoint()).getPoller();
if (p == null) {
// Connector has been stopped
- release(socket, processor, true, false);
+ release(socket, processor, false);
} else {
p.add(socket.getSocket().longValue(), -1, true, false);
}
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=1652396&r1=1652395&r2=1652396&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:18 2015
@@ -152,19 +152,9 @@ public class Http11Nio2Protocol extends
}
- /**
- * Expected to be used by the handler once the processor is no longer
- * required.
- *
- * @param socket
- * @param processor
- * @param isSocketClosing Not used in HTTP
- * @param addToPoller
- */
@Override
public void release(SocketWrapperBase<Nio2Channel> socket,
- Processor<Nio2Channel> processor, boolean isSocketClosing,
- boolean addToPoller) {
+ Processor<Nio2Channel> processor, boolean addToPoller) {
processor.recycle();
recycledProcessors.push(processor);
if (socket.isAsync()) {
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=1652396&r1=1652395&r2=1652396&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:18 2015
@@ -204,19 +204,9 @@ public class Http11NioProtocol extends A
}
- /**
- * Expected to be used by the handler once the processor is no longer
- * required.
- *
- * @param socket
- * @param processor
- * @param isSocketClosing Not used in HTTP
- * @param addToPoller
- */
@Override
public void release(SocketWrapperBase<NioChannel> socket,
- Processor<NioChannel> processor, boolean isSocketClosing,
- boolean addToPoller) {
+ Processor<NioChannel> processor, boolean addToPoller) {
processor.recycle();
recycledProcessors.push(processor);
if (addToPoller) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
