From 85e41abf10fb87a7680c33a8435aa517bd85885e Mon Sep 17 00:00:00 2001
From: Nitin <nitinchauhan@hotmail.com>
Date: Wed, 20 Jan 2016 20:01:27 +0530
Subject: [PATCH] context.close is correct. 542 may have other reason/s!

---
 src/main/java/com/zaxxer/hikari/HikariConfig.java      | 2 +-
 src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zaxxer/hikari/HikariConfig.java b/src/main/java/com/zaxxer/hikari/HikariConfig.java
index ce6fe609..98195fbc 100644
--- a/src/main/java/com/zaxxer/hikari/HikariConfig.java
+++ b/src/main/java/com/zaxxer/hikari/HikariConfig.java
@@ -857,7 +857,7 @@ public class HikariConfig implements HikariConfigMXBean
 
       if (maxPoolSize < 0) {
          if (minIdle < 0) {
-        	 minIdle = 10;
+            minIdle = 10;
          }
          maxPoolSize = minIdle;
       }
diff --git a/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java b/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java
index 8f41ce82..e81bdf17 100644
--- a/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java
+++ b/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java
@@ -85,9 +85,9 @@ public class HikariJNDIFactory implements ObjectFactory
 
       DataSource jndiDS = (DataSource) context.lookup(jndiName);
       if (jndiDS == null) {
-         Context initContext = new InitialContext();
-         jndiDS = (DataSource) initContext.lookup(jndiName);
-         //context.close(); // questionable
+         final Context ic = new InitialContext();
+         jndiDS = (DataSource) ic.lookup(jndiName);
+         ic.close();
       }
 
       if (jndiDS != null) {