From 04005cf619bbcb4edc48ab53e5474f98522b578d Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Mon, 17 Mar 2014 23:52:44 +0900
Subject: [PATCH] fix #43 add null check to shutdown

---
 .../java/com/zaxxer/hikari/HikariDataSource.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zaxxer/hikari/HikariDataSource.java b/src/main/java/com/zaxxer/hikari/HikariDataSource.java
index 41300803..06a3f55a 100644
--- a/src/main/java/com/zaxxer/hikari/HikariDataSource.java
+++ b/src/main/java/com/zaxxer/hikari/HikariDataSource.java
@@ -172,14 +172,14 @@ public class HikariDataSource extends HikariConfig implements DataSource
     {
         boolean shutdown = isShutdown;
         isShutdown = true;
-        if (!shutdown)
+        if (!shutdown && pool != null)
         {
             pool.shutdown();
-        }
-
-        if (pool.dataSource instanceof DriverDataSource)
-        {
-            ((DriverDataSource) pool.dataSource).shutdown();
+            
+            if (pool.dataSource instanceof DriverDataSource)
+            {
+                ((DriverDataSource) pool.dataSource).shutdown();
+            }
         }
 
         pool = null;