From b7284da738e45f15fa1faa0f8f83db8df98ca1f1 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Mon, 17 Mar 2014 23:57:46 +0900
Subject: [PATCH] Remove redundant shutdown check (handled properly by the
 pool), and unnecessary assignment to null in the case where pool is already
 null.

---
 src/main/java/com/zaxxer/hikari/HikariDataSource.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zaxxer/hikari/HikariDataSource.java b/src/main/java/com/zaxxer/hikari/HikariDataSource.java
index 06a3f55a..21646ebf 100644
--- a/src/main/java/com/zaxxer/hikari/HikariDataSource.java
+++ b/src/main/java/com/zaxxer/hikari/HikariDataSource.java
@@ -70,11 +70,6 @@ public class HikariDataSource extends HikariConfig implements DataSource
     @Override
     public Connection getConnection() throws SQLException
     {
-        if (isShutdown)
-        {
-        	throw new IllegalStateException("The datasource has been shutdown.");
-        }
-
         if (fastPathPool != null)
         {
         	return fastPathPool.getConnection();
@@ -180,9 +175,9 @@ public class HikariDataSource extends HikariConfig implements DataSource
             {
                 ((DriverDataSource) pool.dataSource).shutdown();
             }
+            
+            pool = null;
         }
-
-        pool = null;
     }
 
     /** {@inheritDoc} */