From 4d54c8f1d58ff95be772d8195229dfc3181d05c4 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Wed, 14 Oct 2015 23:33:18 +0900
Subject: [PATCH] Update change log.  Try re-enabling
 TestConnectionCloseBlocking test.

---
 CHANGES                                                     | 5 ++++-
 .../com/zaxxer/hikari/pool/TestConnectionCloseBlocking.java | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5863f107..265b2af3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,7 +14,10 @@ Changes in 2.4.2
 
  * Performance improvements in the getConnection()/close() hot path.
 
- * issue 415: remove use of java.beans classes to allow use of HikariCP with the
+ * issue 452: fixed race condition when creating an rapidly ramping connections in the
+   pool.
+
+ * issue 415: removed use of java.beans classes to allow use of HikariCP with the
    Zulu JRE compact3 profile.
 
  * issue 406: execute validation query during connection setup to make sure it is
diff --git a/src/test/java/com/zaxxer/hikari/pool/TestConnectionCloseBlocking.java b/src/test/java/com/zaxxer/hikari/pool/TestConnectionCloseBlocking.java
index 4031c931..867722ca 100644
--- a/src/test/java/com/zaxxer/hikari/pool/TestConnectionCloseBlocking.java
+++ b/src/test/java/com/zaxxer/hikari/pool/TestConnectionCloseBlocking.java
@@ -12,6 +12,7 @@ import java.sql.SQLException;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
+import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
@@ -28,8 +29,9 @@ import com.zaxxer.hikari.util.UtilityElf;
  *
  */
 public class TestConnectionCloseBlocking {
-   private volatile boolean shouldFail = false;
+   private static volatile boolean shouldFail = false;
 
+   @Test
    public void testConnectionCloseBlocking() throws SQLException {
       HikariConfig config = new HikariConfig();
       config.setMinimumIdle(0);
@@ -57,7 +59,7 @@ public class TestConnectionCloseBlocking {
       }
    }
 
-   private class CustomMockDataSource extends MockDataSource {
+   private static class CustomMockDataSource extends MockDataSource {
       @Override
       public Connection getConnection() throws SQLException {
          Connection mockConnection = super.getConnection();