From aea005d4ea9c6f525ecd74f1e1f0794f7c7be8e9 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Sat, 27 Sep 2014 22:47:46 +0900
Subject: [PATCH] Fix potential (but never encountered) NPE

---
 .../src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java  | 2 +-
 .../src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java
index 27356d0a..fbcdc971 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java
@@ -473,7 +473,7 @@ public abstract class ConnectionProxy implements IHikariConnectionProxy
       checkClosed();
       try {
          delegate.setCatalog(catalog);
-         isCatalogDirty = !catalog.equals(parentPool.catalog);
+         isCatalogDirty = (catalog != null && !catalog.equals(parentPool.catalog)) || (catalog == null && parentPool.catalog != null);
       }
       catch (SQLException e) {
          throw checkException(e);
diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java b/hikaricp/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java
index 33b6792c..f348dca0 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java
@@ -474,7 +474,7 @@ public abstract class ConnectionProxy implements IHikariConnectionProxy
       checkClosed();
       try {
          delegate.setCatalog(catalog);
-         isCatalogDirty = !catalog.equals(parentPool.catalog);
+         isCatalogDirty = (catalog != null && !catalog.equals(parentPool.catalog)) || (catalog == null && parentPool.catalog != null);
       }
       catch (SQLException e) {
          throw checkException(e);