From f601340304901069495b9df16bde7b9f23ed2272 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Mon, 23 Sep 2024 23:30:58 +0900
Subject: [PATCH] Minor debug logging change.

---
 pom.xml                                                 | 2 +-
 src/main/java/com/zaxxer/hikari/pool/HikariPool.java    | 6 ++----
 src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 90633dff..746f5a62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
       <artifact.classifier/>
 
       <docker.maven.plugin.fabric8.version>0.36.0</docker.maven.plugin.fabric8.version>
-      <felix.bundle.plugin.version>5.1.1</felix.bundle.plugin.version>
+      <felix.bundle.plugin.version>5.1.9</felix.bundle.plugin.version>
       <felix.version>6.0.1</felix.version>
       <hibernate.version>5.4.24.Final</hibernate.version>
       <javassist.version>3.27.0-GA</javassist.version>
diff --git a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
index 07712055..61ec83f7 100644
--- a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
+++ b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@@ -402,9 +402,9 @@ public final class HikariPool extends PoolBase implements HikariPoolMXBean, IBag
    void logPoolState(String... prefix)
    {
       if (logger.isDebugEnabled()) {
-         logger.debug("{} - {}stats (total={}, active={}, idle={}, waiting={})",
+         logger.debug("{} - {}stats (total={}/{}, idle={}/{}, active={}, waiting={})",
                       poolName, (prefix.length > 0 ? prefix[0] : ""),
-                      getTotalConnections(), getActiveConnections(), getIdleConnections(), getThreadsAwaitingConnection());
+                      getTotalConnections(), config.getMaximumPoolSize(), getIdleConnections(), config.getMinimumIdle(), getActiveConnections(), getThreadsAwaitingConnection());
       }
    }
 
@@ -740,8 +740,6 @@ public final class HikariPool extends PoolBase implements HikariPoolMXBean, IBag
          finally {
             if (added && loggingPrefix != null)
                logPoolState(loggingPrefix);
-            else
-               logPoolState("Connection not added, ");
          }
 
          // Pool is suspended, shutdown, or at max size
diff --git a/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java b/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java
index 95dab9e3..971cb8d7 100644
--- a/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java
+++ b/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java
@@ -45,7 +45,7 @@ import static java.util.concurrent.locks.LockSupport.parkNanos;
  * ThreadLocal lists can be "stolen" when the borrowing thread has none
  * of its own.  It is a "lock-less" implementation using a specialized
  * AbstractQueuedLongSynchronizer to manage cross-thread signaling.
- *
+ * <p>
  * Note that items that are "borrowed" from the bag are not actually
  * removed from any collection, so garbage collection will not occur
  * even if the reference is abandoned.  Thus care must be taken to