Author: kfujino
Date: Tue Aug 2 07:13:43 2016
New Revision: 1754830
URL: http://svn.apache.org/viewvc?rev=1754830&view=rev
Log:
Revert r1750434.
This feature has not been backported yet.
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1754830&r1=1754829&r2=1754830&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Aug 2
07:13:43 2016
@@ -451,17 +451,11 @@
</attribute>
<attribute name="maxAge" required="false">
- <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>
+ <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>
</attribute>
<attribute name="useEquals" required="false">
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=1754830&r1=1754829&r2=1754830&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Aug 2 07:13:43 2016
@@ -157,11 +157,6 @@
<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
