You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2012/04/28 16:20:03 UTC
svn commit: r1331774 - in /tomcat/tc6.0.x/trunk: ./
java/org/apache/catalina/core/ webapps/docs/changelog.xml
webapps/docs/jndi-resources-howto.xml
Author: rjung
Date: Sat Apr 28 14:20:03 2012
New Revision: 1331774
URL: http://svn.apache.org/viewvc?rev=1331774&view=rev
Log:
BZ 53158: Fix documented defaults for DBCP.
Patch provided by ph.dezanneau at gmail.com.
Backport of r1331766 from trunk resp.
r1331772 from tc7.0.x.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1331766
Merged /tomcat/tc7.0.x/trunk:r1331772
Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/
------------------------------------------------------------------------------
Merged /tomcat/tc7.0.x/trunk/java/org/apache/catalina/core:r1331772
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1331774&r1=1331773&r2=1331774&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Apr 28 14:20:03 2012
@@ -166,6 +166,10 @@
<bug>52641</bug>: Remove mentioning of ldap.jar from docs.
Patch provided by Felix Schumacher. (rjung)
</fix>
+ <fix>
+ <bug>53158</bug>: Fix documented defaults for DBCP.
+ Patch provided by ph.dezanneau at gmail.com. (rjung)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml?rev=1331774&r1=1331773&r2=1331774&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml Sat Apr 28 14:20:03 2012
@@ -708,13 +708,13 @@ conn.close();
<ul>
<li><strong>timeBetweenEvictionRunsMillis</strong> - The number of
milliseconds between consecutive runs of the evictor.
- Default: 30*60*1000 (30 minutes)</li>
+ Default: -1 (disabled)</li>
<li><strong>numTestsPerEvictionRun</strong> - The number of connections
that will be checked for idleness by the evitor during each
run of the evictor. Default: 3</li>
<li><strong>minEvictableIdleTimeMillis</strong> - The idle time in
milliseconds after which a connection can be removed from the pool
- by the evictor. Default: -1 (disabled)</li>
+ by the evictor. Default: 30*60*1000 (30 minutes)</li>
<li><strong>testWhileIdle</strong> - true or false: whether a connection
should be validated by the evictor thread using the validation query
while sitting idle in the pool. Default: false</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org