Fix test case

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@793766 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/jdbc-pool/.classpath b/modules/jdbc-pool/.classpath
index a0b71e1..d0fc4fd 100644 (file)
--- a/modules/jdbc-pool/.classpath
+++ b/modules/jdbc-pool/.classpath
@@ -5,7 +5,7 @@
        <classpathentry combineaccessrules="false" kind="src" path="/tomcat-trunk"/>
        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
        <classpathentry kind="var" path="TOMCAT_LIBS_BASE/tomcat6-deps/dbcp/tomcat-dbcp.jar" sourcepath="/TOMCAT_LIBS_BASE/tomcat6-deps/dbcp/src/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_14"/>
        <classpathentry kind="lib" path="includes/mysql-connector-java-5.1.7/mysql-connector-java-5.1.7-bin.jar"/>
        <classpathentry kind="lib" path="includes/db-derby-10.5.1.1-bin/lib/derby.jar"/>
        <classpathentry kind="lib" path="includes/h2/bin/h2-1.1.115.jar"/>

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
index b319919..90839df 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
@@ -188,7 +188,8 @@ public class SlowQueryReport extends AbstractQueryReport  {
     @Override
     public void reset(ConnectionPool parent, PooledConnection con) {
         super.reset(parent, con);
-        queries = SlowQueryReport.perPoolStats.get(parent.getName());
+        if (parent!=null) 
+            queries = SlowQueryReport.perPoolStats.get(parent.getName());
     }