Author: kfujino
Date: Tue Jul 21 07:00:50 2015
New Revision: 1692056
URL: http://svn.apache.org/r1692056
Log:
Fix potential NPE in QueryTimeoutInterceptor.
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java?rev=1692056&r1=1692055&r2=1692056&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
Tue Jul 21 07:00:50 2015
@@ -28,12 +28,13 @@ import org.apache.tomcat.jdbc.pool.PoolP
public class QueryTimeoutInterceptor extends
AbstractCreateStatementInterceptor {
private static Log log = LogFactory.getLog(QueryTimeoutInterceptor.class);
- int timeout;
+ int timeout = 1;
@Override
public void setProperties(Map<String,InterceptorProperty> properties) {
super.setProperties(properties);
- timeout = properties.get("queryTimeout").getValueAsInt(-1);
+ InterceptorProperty p = properties.get("queryTimeout");
+ if (p!=null) timeout = p.getValueAsInt(timeout);
}
@Override
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=1692056&r1=1692055&r2=1692056&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Jul 21 07:00:50 2015
@@ -121,6 +121,9 @@
of <code>SlowQueryReport</code> is changed to <code>false</code> so
that
the failed queries are not logged by default. (kfujino)
</fix>
+ <fix>
+ Fix potential NPE in <code>QueryTimeoutInterceptor</code>. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
