fix #43 add null check to shutdown

pull/60/head
Brett Wooldridge 11 years ago
parent 4dea4c8d41
commit 04005cf619

@ -172,14 +172,14 @@ public class HikariDataSource extends HikariConfig implements DataSource
{ {
boolean shutdown = isShutdown; boolean shutdown = isShutdown;
isShutdown = true; isShutdown = true;
if (!shutdown) if (!shutdown && pool != null)
{ {
pool.shutdown(); pool.shutdown();
}
if (pool.dataSource instanceof DriverDataSource)
if (pool.dataSource instanceof DriverDataSource) {
{ ((DriverDataSource) pool.dataSource).shutdown();
((DriverDataSource) pool.dataSource).shutdown(); }
} }
pool = null; pool = null;

Loading…
Cancel
Save