Author: kfujino
Date: Tue Jun 28 01:57:07 2016
New Revision: 1750431
URL: http://svn.apache.org/viewvc?rev=1750431&view=rev
Log:
Fix the description of maxAge attribute in jdbc-pool doc.
This attribute works both when a connection is returned and when a connection
is borrowed.
Modified:
tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1750431&r1=1750430&r2=1750431&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Jun 28 01:57:07 2016
@@ -470,11 +470,17 @@
</attribute>
<attribute name="maxAge" required="false">
- <p>(long) Time in milliseconds to keep this connection. When a
connection is returned to the pool,
- the pool will check to see if the <code>now - time-when-connected >
maxAge</code> has been reached,
- and if so, it closes the connection rather than returning it to the
pool.
- The default value is <code>0</code>, which implies that connections
will be left open and no age check
- will be done upon returning the connection to the pool.</p>
+ <p>(long) Time in milliseconds to keep this connection. This attribute
+ works both when returning connection and when borrowing connection.
+ When a connection is borrowed from the pool, the pool will check to
see
+ if the <code>now - time-when-connected > maxAge</code> has been
reached
+ , and if so, it reconnects before borrow it. When a connection is
+ returned to the pool, the pool will check to see if the
+ <code>now - time-when-connected > maxAge</code> has been reached, and
+ if so, it closes the connection rather than returning it to the pool.
+ The default value is <code>0</code>, which implies that connections
+ will be left open and no age check will be done upon borrowing from
the
+ pool and returning the connection to the pool.</p>
</attribute>
<attribute name="useEquals" required="false">
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1750431&r1=1750430&r2=1750431&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 28 01:57:07 2016
@@ -140,6 +140,11 @@
<strong>Realm</strong>s. Also document the <code>NullRealm</code> and
when it is automatically created for an <strong>Engine</strong>.
(markt)
</fix>
+ <fix>
+ Fix the description of <code>maxAge</code> attribute in jdbc-pool doc.
+ This attribute works both when a connection is returned and when a
+ connection is borrowed. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Tribes">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
