Better fix for #93 prepend "HikariPool-" to user specified pool names. Don't unconditionally set pool name to generated name.

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();
    }
 

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();
    }