From d2a57757f3cc44f9b992230c28e6f3d13169a9eb Mon Sep 17 00:00:00 2001
From: h-thurow <thurow.h@googlemail.com>
Date: Sat, 18 Nov 2017 12:03:14 +0100
Subject: [PATCH] Issue #928: HikariJNDIFactory should not throw a
 NamingException when !"javax.sql.DataSource".equals(ref.getClassName()).

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

diff --git a/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java b/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java
index b768fe61..9e964de4 100644
--- a/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java
+++ b/src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java
@@ -57,9 +57,7 @@ public class HikariJNDIFactory implements ObjectFactory
          }
          return createDataSource(properties, nameCtx);
       }
-      else {
-         return null;
-      }
+      return null;
    }
 
    private DataSource createDataSource(final Properties properties, final Context context) throws NamingException