From a7e8852a9f65d231d5ab46c38dfc20e8f347e8f8 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Mon, 2 Jun 2014 23:05:41 +0900
Subject: [PATCH] Minor cleanup.

---
 src/main/java/com/zaxxer/hikari/pool/HikariPool.java    | 4 ++--
 src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
index 6fc3c504..3e852dc9 100644
--- a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
+++ b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@@ -410,7 +410,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
    {
       try {
          final boolean timeoutEnabled = (configuration.getConnectionTimeout() != Integer.MAX_VALUE);
-         timeoutMs = timeoutEnabled ? Math.max(1000L, timeoutMs) : 0;
+         timeoutMs = timeoutEnabled ? Math.max(1000L, timeoutMs) : 0L;
 
          if (isJdbc4ConnectionTest) {
             return connection.isValid((int) TimeUnit.MILLISECONDS.toSeconds(timeoutMs));
@@ -484,7 +484,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
       }
 
       assassinExecutor.shutdown();
-      assassinExecutor.awaitTermination(5, TimeUnit.SECONDS);
+      assassinExecutor.awaitTermination(5L, TimeUnit.SECONDS);
    }
 
    /**
diff --git a/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java b/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java
index c238b717..eb5122bf 100644
--- a/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java
+++ b/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java
@@ -133,7 +133,7 @@ public class ConcurrentBag<T extends com.zaxxer.hikari.util.ConcurrentBag.IBagMa
 
          timeout -= (System.nanoTime() - startScan);
       }
-      while (timeout > 0);
+      while (timeout > 0L);
 
       return null;
    }
@@ -164,7 +164,7 @@ public class ConcurrentBag<T extends com.zaxxer.hikari.util.ConcurrentBag.IBagMa
          synchronizer.releaseShared(System.nanoTime());
       }
       else {
-         throw new IllegalStateException("Value was returned to the bag that was not borrowed: ");
+         throw new IllegalStateException("Value was returned to the bag that was not borrowed: " + value);
       }
    }
 
@@ -319,7 +319,7 @@ public class ConcurrentBag<T extends com.zaxxer.hikari.util.ConcurrentBag.IBagMa
       @Override
       protected long tryAcquireShared(long startScanTime)
       {
-         return getState() >= startScanTime && !java67hasQueuedPredecessors() ? 1 : -1;
+         return getState() >= startScanTime && !java67hasQueuedPredecessors() ? 1L : -1L;
       }
 
       /** {@inheritDoc} */