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 2014/11/12 11:49:02 UTC
svn commit: r1638748 - in /tomcat/trunk/java/org/apache:
coyote/ajp/AbstractAjpProcessor.java coyote/ajp/AjpAprProcessor.java
coyote/ajp/AjpNio2Processor.java coyote/ajp/AjpNioProcessor.java
tomcat/util/net/AprEndpoint.java
Author: markt
Date: Wed Nov 12 10:49:02 2014
New Revision: 1638748
URL: http://svn.apache.org/r1638748
Log:
Simplify calls to switch between standard and keep-alive timeouts
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
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=1638748&r1=1638747&r2=1638748&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Wed Nov 12 10:49:02 2014
@@ -738,7 +738,7 @@ public abstract class AbstractAjpProcess
}
// Set back timeout if keep alive timeout is enabled
if (keepAliveTimeout > 0) {
- setTimeout(socketWrapper, soTimeout);
+ socketWrapper.setTimeout(soTimeout);
}
// Check message type, process right away and break if
// not regular request processing
@@ -843,7 +843,7 @@ public abstract class AbstractAjpProcess
rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
// Set keep alive timeout if enabled
if (keepAliveTimeout > 0) {
- setTimeout(socketWrapper, keepAliveTimeout);
+ socketWrapper.setTimeout(keepAliveTimeout);
}
recycle(false);
@@ -935,9 +935,6 @@ public abstract class AbstractAjpProcess
protected abstract void setupSocket(SocketWrapperBase<S> socketWrapper)
throws IOException;
- protected abstract void setTimeout(SocketWrapperBase<S> socketWrapper,
- int timeout) throws IOException;
-
// Methods used by readMessage
/**
* Read at least the specified amount of bytes, and place them
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1638748&r1=1638747&r2=1638748&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Wed Nov 12 10:49:02 2014
@@ -95,14 +95,6 @@ public class AjpAprProcessor extends Abs
@Override
- protected void setTimeout(SocketWrapperBase<Long> socketWrapper,
- int timeout) throws IOException {
- Socket.timeoutSet(
- socketWrapper.getSocket().longValue(), timeout * 1000);
- }
-
-
- @Override
protected int output(byte[] src, int offset, int length, boolean block)
throws IOException {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java?rev=1638748&r1=1638747&r2=1638748&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java Wed Nov 12 10:49:02 2014
@@ -127,13 +127,6 @@ public class AjpNio2Processor extends Ab
@Override
- protected void setTimeout(SocketWrapperBase<Nio2Channel> socketWrapper,
- int timeout) throws IOException {
- socketWrapper.setTimeout(timeout);
- }
-
-
- @Override
protected int output(byte[] src, int offset, int length, boolean block)
throws IOException {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1638748&r1=1638747&r2=1638748&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Wed Nov 12 10:49:02 2014
@@ -107,13 +107,6 @@ public class AjpNioProcessor extends Abs
@Override
- protected void setTimeout(SocketWrapperBase<NioChannel> socketWrapper,
- int timeout) throws IOException {
- socketWrapper.setTimeout(timeout);
- }
-
-
- @Override
protected int output(byte[] src, int offset, int length, boolean block)
throws IOException {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1638748&r1=1638747&r2=1638748&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Nov 12 10:49:02 2014
@@ -2374,6 +2374,16 @@ public class AprEndpoint extends Abstrac
}
+ // TODO Can this be removed once all reads and writes are handled within
+ // this class?
+ @Override
+ public void setTimeout(long timeout) {
+ super.setTimeout(timeout);
+ Socket.timeoutSet(getSocket().longValue(), timeout * 1000);
+ }
+
+
+
@Override
public int read(boolean block, byte[] b, int off, int len) throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org