Author: kfujino
Date: Thu Oct 29 08:28:57 2015
New Revision: 1711190
URL: http://svn.apache.org/viewvc?rev=1711190&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/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
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=1711190&r1=1711189&r2=1711190&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Thu Oct 29 08:28:57 2015
@@ -694,6 +694,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/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1711190&r1=1711189&r2=1711190&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
Thu Oct 29 08:28:57 2015
@@ -148,14 +148,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);
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
