Test leak detection.

hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java

@@ -721,7 +721,7 @@ public class HikariConfig implements HikariConfigMBean
          idleTimeout = IDLE_TIMEOUT;
       }
 
-      if (leakDetectionThreshold != 0 && leakDetectionThreshold < TimeUnit.SECONDS.toMillis(10)) {
+      if (leakDetectionThreshold != 0 && leakDetectionThreshold < TimeUnit.SECONDS.toMillis(10) && !unitTest) {
          logger.warn("leakDetectionThreshold is less than 10000ms, did you specify the wrong time unit?  Disabling leak detection");
          leakDetectionThreshold = 0;
       }

hikaricp-java6/src/main/java/com/zaxxer/hikari/util/LeakTask.java

@@ -54,7 +54,7 @@ public class LeakTask implements Runnable
    {
       if (System.currentTimeMillis() > leakTime) {
          StackTraceElement[] trace = new StackTraceElement[stackTrace.length - 3];
-         System.arraycopy(stackTrace, 4, trace, 0, trace.length);
+         System.arraycopy(stackTrace, 3, trace, 0, trace.length);
 
          LeakException e = new LeakException(trace);
          LoggerFactory.getLogger(LeakTask.class).warn("Connection leak detection triggered, stack trace follows", e);
@@ -79,7 +79,7 @@ public class LeakTask implements Runnable
        */
       public LeakException(final StackTraceElement[] stackTrace)
       {
-         super("Connection Leak", null, true, false);
+         super("Connection Leak", null, true, true);
          this.setStackTrace(stackTrace);
       }
    }

hikaricp-java6/src/test/java/com/zaxxer/hikari/MiscTest.java

@@ -16,14 +16,19 @@
 
 package com.zaxxer.hikari;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 import java.io.PrintWriter;
+import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.zaxxer.hikari.util.ConcurrentBag;
 import com.zaxxer.hikari.util.ConcurrentBag.BagEntry;
+import com.zaxxer.hikari.util.LeakTask;
 import com.zaxxer.hikari.util.PoolUtilities;
 
 /**
@@ -37,6 +42,7 @@ public class MiscTest
       HikariConfig config = new HikariConfig();
       config.setMinimumIdle(1);
       config.setMaximumPoolSize(4);
+      config.setPoolName("test");
       config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
       TestElf.setConfigUnitTest();
 
@@ -45,6 +51,7 @@ public class MiscTest
          PrintWriter writer = new PrintWriter(System.out);
          ds.setLogWriter(writer);
          Assert.assertSame(writer, ds.getLogWriter());
+         Assert.assertEquals("test", config.getPoolName());
       }
       finally
       {
@@ -82,4 +89,34 @@ public class MiscTest
       ConcurrentBag<BagEntry> bag = new ConcurrentBag<BagEntry>(null);
       bag.dumpState();
    }
+
+   @Test
+   public void testLeakDetection() throws SQLException
+   {
+      HikariConfig config = new HikariConfig();
+      config.setMinimumIdle(1);
+      config.setMaximumPoolSize(4);
+      config.setPoolName("test");
+      config.setLeakDetectionThreshold(TimeUnit.SECONDS.toMillis(1));
+      config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+      TestElf.setConfigUnitTest();
+
+      final HikariDataSource ds = new HikariDataSource(config);
+      try {
+         ByteArrayOutputStream baos = new ByteArrayOutputStream();
+         PrintStream ps = new PrintStream(baos, true);
+         TestElf.setSlf4jTargetStream(LeakTask.class, ps);
+
+         Connection connection = ds.getConnection();
+         PoolUtilities.quietlySleep(TimeUnit.SECONDS.toMillis(3));
+         ps.flush();
+         connection.close();
+         String s = new String(baos.toByteArray());
+         Assert.assertTrue(s.contains("Connection leak detection"));
+      }
+      finally
+      {
+         ds.close();
+      }
+   }
 }

hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java

@@ -721,7 +721,7 @@ public class HikariConfig implements HikariConfigMBean
          idleTimeout = IDLE_TIMEOUT;
       }
 
-      if (leakDetectionThreshold != 0 && leakDetectionThreshold < TimeUnit.SECONDS.toMillis(10)) {
+      if (leakDetectionThreshold != 0 && leakDetectionThreshold < TimeUnit.SECONDS.toMillis(10) && !unitTest) {
          logger.warn("leakDetectionThreshold is less than 10000ms, did you specify the wrong time unit?  Disabling leak detection");
          leakDetectionThreshold = 0;
       }

hikaricp/src/main/java/com/zaxxer/hikari/util/LeakTask.java

@@ -54,7 +54,7 @@ public class LeakTask implements Runnable
    {
       if (System.currentTimeMillis() > leakTime) {
          StackTraceElement[] trace = new StackTraceElement[stackTrace.length - 3];
-         System.arraycopy(stackTrace, 4, trace, 0, trace.length);
+         System.arraycopy(stackTrace, 3, trace, 0, trace.length);
 
          LeakException e = new LeakException(trace);
          LoggerFactory.getLogger(LeakTask.class).warn("Connection leak detection triggered, stack trace follows", e);
@@ -79,7 +79,7 @@ public class LeakTask implements Runnable
        */
       public LeakException(final StackTraceElement[] stackTrace)
       {
-         super("Connection Leak", null, true, false);
+         super("Connection Leak", null, true, true);
          this.setStackTrace(stackTrace);
       }
    }

hikaricp/src/test/java/com/zaxxer/hikari/MiscTest.java

@@ -16,14 +16,19 @@
 
 package com.zaxxer.hikari;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 import java.io.PrintWriter;
+import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.zaxxer.hikari.util.ConcurrentBag;
 import com.zaxxer.hikari.util.ConcurrentBag.BagEntry;
+import com.zaxxer.hikari.util.LeakTask;
 import com.zaxxer.hikari.util.PoolUtilities;
 
 /**
@@ -84,4 +89,34 @@ public class MiscTest
       ConcurrentBag<BagEntry> bag = new ConcurrentBag<BagEntry>(null);
       bag.dumpState();
    }
+
+   @Test
+   public void testLeakDetection() throws SQLException
+   {
+      HikariConfig config = new HikariConfig();
+      config.setMinimumIdle(1);
+      config.setMaximumPoolSize(4);
+      config.setPoolName("test");
+      config.setLeakDetectionThreshold(TimeUnit.SECONDS.toMillis(1));
+      config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+      TestElf.setConfigUnitTest();
+
+      final HikariDataSource ds = new HikariDataSource(config);
+      try {
+         ByteArrayOutputStream baos = new ByteArrayOutputStream();
+         PrintStream ps = new PrintStream(baos, true);
+         TestElf.setSlf4jTargetStream(LeakTask.class, ps);
+
+         Connection connection = ds.getConnection();
+         PoolUtilities.quietlySleep(TimeUnit.SECONDS.toMillis(3));
+         ps.flush();
+         connection.close();
+         String s = new String(baos.toByteArray());
+         Assert.assertTrue(s.contains("Connection leak detection"));
+      }
+      finally
+      {
+         ds.close();
+      }
+   }
 }