Eliminate double-execution of shutdown code.

11 years ago · bbac41d3e9
parent c813dbd997
commit bbac41d3e9
1 changed files with 14 additions and 11 deletions
--- a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
+++ b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@ -223,6 +223,8 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
    }

    public void shutdown()
+    {
+        if (!isShutdown)
        {
            isShutdown = true;
            houseKeepingTimer.cancel();
@ -238,6 +240,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
                HikariMBeanElf.unregisterMBeans(configuration, this);
            }
        }
+    }

    public DataSource getDataSource()
    {