Author: kfujino
Date: Thu Oct 29 08:36:22 2015
New Revision: 1711192
URL: http://svn.apache.org/viewvc?rev=1711192&view=rev
Log:
When creating a QueryStats object, ensure that maxQueries is checked.
If maxQueries is a value less than or equal to 0, QueryStats are never created.
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
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=1711192&r1=1711191&r2=1711192&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 Thu Oct 29
08:36:22 2015
@@ -668,6 +668,7 @@
</attribute>
<attribute name="maxQueries" required="false">
<p>(int as String) The maximum number of queries to keep track of in
order to preserve memory space.
+ A value less than or equal to 0 will disable this feature.
The default value is <code>1000</code>.
</p>
</attribute>
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1711192&r1=1711191&r2=1711192&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
Thu Oct 29 08:36:22 2015
@@ -139,14 +139,18 @@ public class SlowQueryReport extends Abs
@Override
public void prepareStatement(String sql, long time) {
- QueryStats qs = getQueryStats(sql);
- if (qs != null) qs.prepare(time);
+ if (this.maxQueries > 0 ) {
+ QueryStats qs = getQueryStats(sql);
+ if (qs != null) qs.prepare(time);
+ }
}
@Override
public void prepareCall(String sql, long time) {
- QueryStats qs = getQueryStats(sql);
- if (qs != null) qs.prepare(time);
+ if (this.maxQueries > 0 ) {
+ QueryStats qs = getQueryStats(sql);
+ if (qs != null) qs.prepare(time);
+ }
}
/**
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=1711192&r1=1711191&r2=1711192&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 29 08:36:22 2015
@@ -145,6 +145,12 @@
<bug>58489</bug>: Correct QueryStatsComparator to hold up the
general contract for Comparator. (fschumacher)
</fix>
+ <fix>
+ When creating a <code>QueryStats</code> object, ensure that
+ <code>maxQueries</code> is checked. If <code>maxQueries</code> is a
+ value less than or equal to 0, <code>QueryStats</code> are never
+ created. (kfujino)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
