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/05/28 11:42:14 UTC
svn commit: r1682189 - in /tomcat/trunk/java/org/apache/coyote/ajp:
AbstractAjpProtocol.java AjpAprProtocol.java AjpNio2Protocol.java
AjpNioProtocol.java
Author: markt
Date: Thu May 28 09:42:13 2015
New Revision: 1682189
URL: http://svn.apache.org/r1682189
Log:
Pull up release()
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=1682189&r1=1682188&r2=1682189&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Thu May 28 09:42:13 2015
@@ -21,6 +21,7 @@ import java.nio.ByteBuffer;
import javax.servlet.http.HttpUpgradeHandler;
import org.apache.coyote.AbstractProtocol;
+import org.apache.coyote.Processor;
import org.apache.coyote.UpgradeProtocol;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
@@ -174,5 +175,17 @@ public abstract class AbstractAjpProtoco
// TODO should fail - throw IOE
return null;
}
+
+
+
+ @Override
+ public void release(SocketWrapperBase<S> socket,
+ Processor processor, boolean addToPoller) {
+ processor.recycle();
+ recycledProcessors.push(processor);
+ if (addToPoller) {
+ socket.registerReadInterest();
+ }
+ }
}
}
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=1682189&r1=1682188&r2=1682189&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Thu May 28 09:42:13 2015
@@ -16,11 +16,9 @@
*/
package org.apache.coyote.ajp;
-import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AprEndpoint;
-import org.apache.tomcat.util.net.SocketWrapperBase;
/**
@@ -83,15 +81,5 @@ public class AjpAprProtocol extends Abst
protected Log getLog() {
return log;
}
-
- @Override
- public void release(SocketWrapperBase<Long> socket,
- Processor processor, boolean addToPoller) {
- processor.recycle();
- recycledProcessors.push(processor);
- if (addToPoller) {
- socket.registerReadInterest();
- }
- }
}
}
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=1682189&r1=1682188&r2=1682189&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Thu May 28 09:42:13 2015
@@ -64,11 +64,13 @@ public class AjpNio2Protocol extends Abs
super(proto);
}
+
@Override
protected Log getLog() {
return log;
}
+
/**
* Expected to be used by the Poller to release resources on socket
* close, errors etc.
@@ -82,15 +84,6 @@ public class AjpNio2Protocol extends Abs
}
}
- @Override
- public void release(SocketWrapperBase<Nio2Channel> socket,
- Processor processor, boolean addToPoller) {
- processor.recycle();
- recycledProcessors.push(processor);
- if (addToPoller) {
- socket.registerReadInterest();
- }
- }
@Override
public void closeAll() {
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=1682189&r1=1682188&r2=1682189&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Thu May 28 09:42:13 2015
@@ -110,16 +110,5 @@ public class AjpNioProtocol extends Abst
recycledProcessors.push(processor);
}
}
-
-
- @Override
- public void release(SocketWrapperBase<NioChannel> socket,
- Processor processor, boolean addToPoller) {
- processor.recycle();
- recycledProcessors.push(processor);
- if (addToPoller) {
- socket.registerReadInterest();
- }
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org