Author: kfujino
Date: Tue Mar 27 05:06:17 2018
New Revision: 1827805
URL: http://svn.apache.org/viewvc?rev=1827805&view=rev
Log:
Enable PoolCleaner to be started even if validationQuery is not set.
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1827805&r1=1827804&r2=1827805&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Tue Mar 27 05:06:17 2018
@@ -921,7 +921,7 @@ public class PoolProperties implements P
boolean timer = getTimeBetweenEvictionRunsMillis()>0;
boolean result = timer && (isRemoveAbandoned() &&
getRemoveAbandonedTimeout()>0);
result = result || (timer && getSuspectTimeout()>0);
- result = result || (timer && isTestWhileIdle() &&
getValidationQuery()!=null);
+ result = result || (timer && isTestWhileIdle());
result = result || (timer && getMinEvictableIdleTimeMillis()>0);
return result;
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1827805&r1=1827804&r2=1827805&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 27 05:06:17 2018
@@ -146,6 +146,10 @@
<code>PreparedStatement</code> and/or <code>CallableStatement</code>
are
cached. (kfujino)
</fix>
+ <fix>
+ Enable PoolCleaner to be started even if <code>validationQuery</code>
+ is not set. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
