From 264e0bb3cad9729180a92783c4eafb076fffa818 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Mon, 13 Oct 2014 23:32:35 +0900
Subject: [PATCH] Remove redundant code from LeakTask

---
 .../java/com/zaxxer/hikari/util/LeakTask.java     | 15 +++++----------
 .../java/com/zaxxer/hikari/util/LeakTask.java     | 15 +++++----------
 .../src/test/java/com/zaxxer/hikari/MiscTest.java |  2 +-
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/LeakTask.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/LeakTask.java
index 10e58e62..06ecaca0 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/LeakTask.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/LeakTask.java
@@ -33,13 +33,11 @@ public class LeakTask implements Runnable
 {
    private static final Logger LOGGER = LoggerFactory.getLogger(LeakTask.class);
 
-   private final long leakTime;
    private final ScheduledFuture<?> scheduledFuture;
    private StackTraceElement[] stackTrace;
 
    public LeakTask()
    {
-      leakTime = 0;
       scheduledFuture = null;
    }
 
@@ -47,7 +45,6 @@ public class LeakTask implements Runnable
    {
       this.stackTrace = new Exception().getStackTrace();
       
-      this.leakTime = System.currentTimeMillis() + leakDetectionThreshold;
       scheduledFuture = executorService.schedule(this, leakDetectionThreshold, TimeUnit.MILLISECONDS);
    }
 
@@ -55,14 +52,12 @@ public class LeakTask implements Runnable
    @Override
    public void run()
    {
-      if (System.currentTimeMillis() > leakTime) {
-         StackTraceElement[] trace = new StackTraceElement[stackTrace.length - 3];
-         System.arraycopy(stackTrace, 3, trace, 0, trace.length);
+      StackTraceElement[] trace = new StackTraceElement[stackTrace.length - 3];
+      System.arraycopy(stackTrace, 3, trace, 0, trace.length);
 
-         LeakException e = new LeakException(trace);
-         LOGGER.warn("Connection leak detection triggered, stack trace follows", e);
-         stackTrace = null;
-      }
+      LeakException e = new LeakException(trace);
+      LOGGER.warn("Connection leak detection triggered, stack trace follows", e);
+      stackTrace = null;
    }
 
    public void cancel()
diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/util/LeakTask.java b/hikaricp/src/main/java/com/zaxxer/hikari/util/LeakTask.java
index 10e58e62..06ecaca0 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/util/LeakTask.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/util/LeakTask.java
@@ -33,13 +33,11 @@ public class LeakTask implements Runnable
 {
    private static final Logger LOGGER = LoggerFactory.getLogger(LeakTask.class);
 
-   private final long leakTime;
    private final ScheduledFuture<?> scheduledFuture;
    private StackTraceElement[] stackTrace;
 
    public LeakTask()
    {
-      leakTime = 0;
       scheduledFuture = null;
    }
 
@@ -47,7 +45,6 @@ public class LeakTask implements Runnable
    {
       this.stackTrace = new Exception().getStackTrace();
       
-      this.leakTime = System.currentTimeMillis() + leakDetectionThreshold;
       scheduledFuture = executorService.schedule(this, leakDetectionThreshold, TimeUnit.MILLISECONDS);
    }
 
@@ -55,14 +52,12 @@ public class LeakTask implements Runnable
    @Override
    public void run()
    {
-      if (System.currentTimeMillis() > leakTime) {
-         StackTraceElement[] trace = new StackTraceElement[stackTrace.length - 3];
-         System.arraycopy(stackTrace, 3, trace, 0, trace.length);
+      StackTraceElement[] trace = new StackTraceElement[stackTrace.length - 3];
+      System.arraycopy(stackTrace, 3, trace, 0, trace.length);
 
-         LeakException e = new LeakException(trace);
-         LOGGER.warn("Connection leak detection triggered, stack trace follows", e);
-         stackTrace = null;
-      }
+      LeakException e = new LeakException(trace);
+      LOGGER.warn("Connection leak detection triggered, stack trace follows", e);
+      stackTrace = null;
    }
 
    public void cancel()
diff --git a/hikaricp/src/test/java/com/zaxxer/hikari/MiscTest.java b/hikaricp/src/test/java/com/zaxxer/hikari/MiscTest.java
index 50b2b84f..0c07eb62 100644
--- a/hikaricp/src/test/java/com/zaxxer/hikari/MiscTest.java
+++ b/hikaricp/src/test/java/com/zaxxer/hikari/MiscTest.java
@@ -115,7 +115,7 @@ public class MiscTest
          ps.close();
          String s = new String(baos.toByteArray());
          Assert.assertNotNull("Exception string was null", s);
-         Assert.assertTrue("Expected exception to contain 'Connection leak detection' but contains\n" + s, s.contains("Connection leak detection"));
+         Assert.assertTrue("Expected exception to contain 'Connection leak detection' but contains *" + s + "*", s.contains("Connection leak detection"));
       }
       finally
       {