This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new 5153065 Align with 9.0.x. Javadoc and spacing. 5153065 is described below commit 5153065ededb55776b304d2c655efe4d12f0092b Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Sep 9 11:14:37 2019 +0100 Align with 9.0.x. Javadoc and spacing. --- .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 1 - java/org/apache/catalina/startup/Tomcat.java | 1 - java/org/apache/coyote/ProtocolHandler.java | 12 ++++++++---- .../apache/tomcat/jdbc/pool/PoolConfiguration.java | 22 ++++++++++++---------- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java index 762f711..2006643 100644 --- a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java +++ b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java @@ -795,7 +795,6 @@ public class SimpleTcpCluster extends LifecycleMBeanBase } } } - return; } public int getChannelStartOptions() { diff --git a/java/org/apache/catalina/startup/Tomcat.java b/java/org/apache/catalina/startup/Tomcat.java index 297f1f4..78f0ae5 100644 --- a/java/org/apache/catalina/startup/Tomcat.java +++ b/java/org/apache/catalina/startup/Tomcat.java @@ -1044,7 +1044,6 @@ public class Tomcat { } } } catch (ClassCastException e) { - return; } } } diff --git a/java/org/apache/coyote/ProtocolHandler.java b/java/org/apache/coyote/ProtocolHandler.java index 6d3842c..4e8d7c4 100644 --- a/java/org/apache/coyote/ProtocolHandler.java +++ b/java/org/apache/coyote/ProtocolHandler.java @@ -22,10 +22,8 @@ import org.apache.tomcat.util.net.SSLHostConfig; /** * Abstract the protocol implementation, including threading, etc. - * Processor is single threaded and specific to stream-based protocols, - * will not fit Jk protocols like JNI. * - * This is the main interface to be implemented by a coyote connector. + * This is the main interface to be implemented by a coyote protocol. * Adapter is the main interface to be implemented by a coyote servlet * container. * @@ -36,12 +34,18 @@ import org.apache.tomcat.util.net.SSLHostConfig; public interface ProtocolHandler { /** + * Return the adapter associated with the protocol handler. + * @return the adapter + */ + public Adapter getAdapter(); + + + /** * The adapter, used to call the connector. * * @param adapter The adapter to associate */ public void setAdapter(Adapter adapter); - public Adapter getAdapter(); /** diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java index 839d46f..2359fc8 100644 --- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java +++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java @@ -699,12 +699,13 @@ public interface PoolConfiguration { public void setUseEquals(boolean useEquals); /** - * Time in milliseconds to keep this connection alive even when used. - * When a connection is returned to the pool, the pool will check to see if the - * ((now - time-when-connected) > maxAge) has been reached, and if so, - * it closes the connection rather than returning it to the pool. + * Time in milliseconds to keep this connection before reconnecting. + * When a connection is idle, returned to the pool or borrowed from the pool, the pool will + * check to see if the ((now - time-when-connected) > maxAge) has been reached, and if so, + * it reconnects. Note that the age of idle connections will only be checked if + * {@link #getTimeBetweenEvictionRunsMillis()} returns a value greater than 0. * The default value is 0, which implies that connections will be left open and no - * age check will be done upon returning the connection to the pool. + * age checks will be done. * This is a useful setting for database sessions that leak memory as it ensures that the session * will have a finite life span. * @return the time in milliseconds a connection will be open for when used @@ -712,12 +713,13 @@ public interface PoolConfiguration { public long getMaxAge(); /** - * Time in milliseconds to keep this connection alive even when used. - * When a connection is returned to the pool, the pool will check to see if the - * ((now - time-when-connected) > maxAge) has been reached, and if so, - * it closes the connection rather than returning it to the pool. + * Time in milliseconds to keep this connection before reconnecting. + * When a connection is idle, returned to the pool or borrowed from the pool, the pool will + * check to see if the ((now - time-when-connected) > maxAge) has been reached, and if so, + * it reconnects. Note that the age of idle connections will only be checked if + * {@link #getTimeBetweenEvictionRunsMillis()} returns a value greater than 0. * The default value is 0, which implies that connections will be left open and no - * age check will be done upon returning the connection to the pool. + * age checks will be done. * This is a useful setting for database sessions that leak memory as it ensures that the session * will have a finite life span. * @param maxAge the time in milliseconds a connection will be open for when used --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org