Author: kfujino
Date: Tue Jul 21 06:59:57 2015
New Revision: 1692055
URL: http://svn.apache.org/r1692055
Log:
Fix potential NPE in QueryTimeoutInterceptor.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java?rev=1692055&r1=1692054&r2=1692055&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
Tue Jul 21 06:59:57 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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
