Author: kfujino Date: Tue Jul 21 06:47:24 2015 New Revision: 1692053 URL: http://svn.apache.org/r1692053 Log: Correct the incorrect document of QueryTimeoutInterceptor. The setting value is not in milliseconds but in seconds.
Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1692053&r1=1692052&r2=1692053&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/tc8.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Jul 21 06:47:24 2015 @@ -675,8 +675,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/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1692053&r1=1692052&r2=1692053&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Jul 21 06:47:24 2015 @@ -106,6 +106,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="jdbc-pool"> <changelog> <fix> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org