From 3d80609d6a69a98fd480f458da3c66aba7089c21 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Mon, 8 Dec 2014 17:40:22 +0900
Subject: [PATCH] Nitin thinks this is more readable.  Not sure I agree, but I
 don't care enough to argue.

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

diff --git a/hikaricp-common/src/main/java/com/zaxxer/hikari/HikariDataSource.java b/hikaricp-common/src/main/java/com/zaxxer/hikari/HikariDataSource.java
index cdf6c9f9..4b0df347 100644
--- a/hikaricp-common/src/main/java/com/zaxxer/hikari/HikariDataSource.java
+++ b/hikaricp-common/src/main/java/com/zaxxer/hikari/HikariDataSource.java
@@ -181,11 +181,13 @@ public class HikariDataSource extends HikariConfig implements DataSource, Closea
       if (iface.isInstance(this)) {
          return (T) this;
       }
-      else if (pool != null) {
+
+      if (pool != null) {
          if (iface.isInstance(pool.getDataSource())) {
             return (T) pool.getDataSource();
          }
-         else if (pool.getDataSource() instanceof Wrapper) {
+
+         if (pool.getDataSource() instanceof Wrapper) {
             return (T) pool.getDataSource().unwrap(iface);
          }
       }