From 9daa51313f8c1a7f26a57d30d48f61ca564febe6 Mon Sep 17 00:00:00 2001
From: Nitin <nitinchauhan@hotmail.com>
Date: Wed, 13 Jan 2016 17:42:02 +0530
Subject: [PATCH] I've added context.close() before but not sure anymore! see
 542

---
 src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java b/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java
index a3c09a18..0ae6cd35 100644
--- a/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java
+++ b/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java
@@ -78,16 +78,16 @@ public class HikariJNDIFactory implements ObjectFactory
 
    private DataSource lookupJndiDataSource(Properties properties, Context context) throws NamingException
    {
+      String jndiName = properties.getProperty("dataSourceJNDI");
       if (context == null) {
-         throw new RuntimeException("dataSourceJNDI property is configured, but local JNDI context is null.");
+         throw new RuntimeException("JNDI context does not found for dataSourceJNDI : " + jndiName);
       }
 
-      String jndiName = properties.getProperty("dataSourceJNDI");
       DataSource jndiDS = (DataSource) context.lookup(jndiName);
       if (jndiDS == null) {
          context = new InitialContext();
          jndiDS = (DataSource) context.lookup(jndiName);
-         context.close();
+         //context.close(); //it should remain open for global contexts?
       }
 
       if (jndiDS != null) {