Author: kkolinko
Date: Sun Mar 24 11:15:47 2013
New Revision: 1460313
URL: http://svn.apache.org/r1460313
Log:
Fix NPE in TestSlowQueryReport test
The TestSlowQueryReport L107 calls "new SlowQueryReportJmx().getObjectName(..)",
and thus properties field in new SlowQueryReportJmx is never set
and accessing it caused NPE in getObjectName(..).
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java?rev=1460313&r1=1460312&r2=1460313&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
Sun Mar 24 11:15:47 2013
@@ -270,9 +270,10 @@ public class SlowQueryReportJmx extends
public ObjectName getObjectName(Class<?> clazz, String poolName) throws
MalformedObjectNameException {
- ObjectName oname = null;
- if (getProperties().containsKey(objectNameAttribute)) {
- oname = new
ObjectName(getProperties().get(objectNameAttribute).getValue());
+ ObjectName oname;
+ Map<String,InterceptorProperty> properties = getProperties();
+ if (properties != null && properties.containsKey(objectNameAttribute))
{
+ oname = new
ObjectName(properties.get(objectNameAttribute).getValue());
} else {
oname = new
ObjectName(ConnectionPool.POOL_JMX_TYPE_PREFIX+clazz.getName()+",name=" +
poolName);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
