From 872e9d642a20797e08efa75ed1ba57f44661e03c Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Tue, 14 Oct 2014 11:55:16 +0900 Subject: [PATCH] Logging message correction, additional javadoc. --- .../src/main/java/com/zaxxer/hikari/pool/HikariPool.java | 7 ++++++- .../src/main/java/com/zaxxer/hikari/pool/HikariPool.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java index c48b5fd5..690c5cfa 100644 --- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java +++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java @@ -227,7 +227,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener } if (isBroken || isShutdown) { - LOGGER.debug("Connection returned to pool {} is broken, or the pool is shutting down. Closing connection.", configuration.getPoolName()); + LOGGER.debug("Connection returned to pool {} is broken, or the pool has been shut down. Closing connection.", configuration.getPoolName()); closeConnection(bagEntry); return; } @@ -271,6 +271,11 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener } } + /** + * Evict a connection from the pool. + * + * @param proxyConnection the connection to evict + */ public void evictConnection(IHikariConnectionProxy proxyConnection) { closeConnection(proxyConnection.getPoolBagEntry()); } diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java index 8dea0173..82a22f1c 100644 --- a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java +++ b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java @@ -224,7 +224,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener } if (isBroken || isShutdown) { - LOGGER.debug("Connection returned to pool {} is broken, or the pool is shutting down. Closing connection.", configuration.getPoolName()); + LOGGER.debug("Connection returned to pool {} is broken, or the pool has been shut down. Closing connection.", configuration.getPoolName()); closeConnection(bagEntry); return; } @@ -268,6 +268,11 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener } } + /** + * Evict a connection from the pool. + * + * @param proxyConnection the connection to evict + */ public void evictConnection(IHikariConnectionProxy proxyConnection) { closeConnection(proxyConnection.getPoolBagEntry()); }