From ace24b3b9cdff86c40ec2c90ab48a28f2e29a69e Mon Sep 17 00:00:00 2001
From: Mikhail Mazurskiy <ash2kk@gmail.com>
Date: Wed, 15 Apr 2015 22:56:18 +1000
Subject: [PATCH] Prevent race in close()

---
 .../com/zaxxer/hikari/HikariDataSource.java     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zaxxer/hikari/HikariDataSource.java b/src/main/java/com/zaxxer/hikari/HikariDataSource.java
index f8b2d115..efa51ca8 100644
--- a/src/main/java/com/zaxxer/hikari/HikariDataSource.java
+++ b/src/main/java/com/zaxxer/hikari/HikariDataSource.java
@@ -22,6 +22,7 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.sql.Wrapper;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.sql.DataSource;
 
@@ -43,7 +44,7 @@ public class HikariDataSource extends HikariConfig implements DataSource, Closea
 {
    private static final Logger LOGGER = LoggerFactory.getLogger(HikariDataSource.class);
 
-   private volatile boolean isShutdown;
+   private final AtomicBoolean isShutdown = new AtomicBoolean();
 
    private final HikariPool fastPathPool;
    private volatile HikariPool pool;
@@ -78,7 +79,7 @@ public class HikariDataSource extends HikariConfig implements DataSource, Closea
    @Override
    public Connection getConnection() throws SQLException
    {
-      if (isShutdown) {
+      if (isShutdown.get()) {
          throw new SQLException("Pool " + pool.getConfiguration().getPoolName() + " has been shutdown");
       }
 
@@ -232,7 +233,7 @@ public class HikariDataSource extends HikariConfig implements DataSource, Closea
     */
    public void evictConnection(Connection connection)
    {
-      if (!isShutdown && pool != null && connection instanceof IHikariConnectionProxy) {
+      if (!isShutdown.get() && pool != null && connection instanceof IHikariConnectionProxy) {
          pool.evictConnection((IHikariConnectionProxy) connection);
       }
    }
@@ -243,7 +244,7 @@ public class HikariDataSource extends HikariConfig implements DataSource, Closea
     */
    public void suspendPool()
    {
-      if (!isShutdown && pool != null) {
+      if (!isShutdown.get() && pool != null) {
          pool.suspendPool();
       }
    }
@@ -253,7 +254,7 @@ public class HikariDataSource extends HikariConfig implements DataSource, Closea
     */
    public void resumePool()
    {
-      if (!isShutdown && pool != null) {
+      if (!isShutdown.get() && pool != null) {
          pool.resumePool();
       }
    }
@@ -264,12 +265,10 @@ public class HikariDataSource extends HikariConfig implements DataSource, Closea
    @Override
    public void close()
    {
-      if (isShutdown) {
+      if (isShutdown.getAndSet(true)) {
          return;
       }
 
-      isShutdown = true;
-
       if (pool != null) {
          try {
             pool.shutdown();
@@ -291,7 +290,7 @@ public class HikariDataSource extends HikariConfig implements DataSource, Closea
     */
    public boolean isClosed()
    {
-      return isShutdown;
+      return isShutdown.get();
    }
 
    /**