From f39341f193f68e7bb85a69dc5da35e47a8923c21 Mon Sep 17 00:00:00 2001
From: Brendan Humphreys <brendan@canva.com>
Date: Thu, 19 Jun 2014 18:34:13 +1000
Subject: [PATCH] don't clobber the pool name in validate()

---
 .../src/main/java/com/zaxxer/hikari/HikariConfig.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 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 9ade527e..2a343671 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java
@@ -679,8 +679,9 @@ public class HikariConfig implements HikariConfigMBean
          }
       }
 
-      poolName = "HikariPool-" + poolNumber++;
-
+      if (poolName == null) {
+          poolName = "HikariPool-" + poolNumber++;
+      }
       logConfiguration();
    }