Fix potential (but never encountered) NPE

11 years ago · aea005d4ea
parent 3b7095b477
commit aea005d4ea
2 changed files with 2 additions and 2 deletions
--- 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);
--- 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);