From 700e423e896a2ba5b6ae32da509bddc95cc88a5d Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Thu, 19 Jun 2014 18:50:44 +0900
Subject: [PATCH] Better fix for #93 prepend "HikariPool-" to user specified
 pool names.  Don't unconditionally set pool name to generated name.

---
 .../src/main/java/com/zaxxer/hikari/HikariConfig.java     | 5 ++++-
 .../src/main/java/com/zaxxer/hikari/HikariConfig.java     | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java
index 2a343671..03515b8f 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java
@@ -585,7 +585,9 @@ public class HikariConfig implements HikariConfigMBean
     */
    public void setPoolName(String poolName)
    {
-      this.poolName = poolName;
+      if (poolName != null) {
+         this.poolName = "HikariPool-" + poolName;
+      }
    }
 
    public int getTransactionIsolation()
@@ -682,6 +684,7 @@ public class HikariConfig implements HikariConfigMBean
       if (poolName == null) {
           poolName = "HikariPool-" + poolNumber++;
       }
+
       logConfiguration();
    }
 
diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java b/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java
index 9ade527e..9d3afd93 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java
@@ -585,7 +585,9 @@ public class HikariConfig implements HikariConfigMBean
     */
    public void setPoolName(String poolName)
    {
-      this.poolName = poolName;
+      if (poolName != null) {
+         this.poolName = "HikariPool-" + poolName;
+      }
    }
 
    public int getTransactionIsolation()
@@ -679,7 +681,9 @@ public class HikariConfig implements HikariConfigMBean
          }
       }
 
-      poolName = "HikariPool-" + poolNumber++;
+      if (poolName == null) {
+         poolName = "HikariPool-" + poolNumber++;
+      }
 
       logConfiguration();
    }