Author: kfujino
Date: Tue Jul 21 06:48:52 2015
New Revision: 1692054
URL: http://svn.apache.org/r1692054
Log:
Correct the incorrect document of QueryTimeoutInterceptor.
The setting value is not in milliseconds but in seconds.
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=1692054&r1=1692053&r2=1692054&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 Jul 21
06:48:52 2015
@@ -649,8 +649,9 @@
</p>
<attributes>
<attribute name="queryTimeout" required="true">
- <p>(int as String) The number of seconds to set for the query timeout
- The default value is <code>1000</code> milliseconds.
+ <p>(int as String) The number of seconds to set for the query timeout.
+ A value less than or equal to zero will disable this feature.
+ The default value is <code>1</code> seconds.
</p>
</attribute>
</attributes>
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=1692054&r1=1692053&r2=1692054&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jul 21 06:48:52 2015
@@ -110,6 +110,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ Correct the incorrect document of <code>QueryTimeoutInterceptor</code>.
+ The setting value is not in milliseconds but in seconds. (kfujino)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
