Author: kfujino
Date: Tue Jul 21 07:01:44 2015
New Revision: 1692057
URL: http://svn.apache.org/r1692057
Log:
Fix potential NPE in QueryTimeoutInterceptor.
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java?rev=1692057&r1=1692056&r2=1692057&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
Tue Jul 21 07:01:44 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/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1692057&r1=1692056&r2=1692057&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jul 21 07:01:44 2015
@@ -118,6 +118,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="jdbc-pool">
+ <changelog>
+ <fix>
+ Fix potential NPE in <code>QueryTimeoutInterceptor</code>. (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
