From bce177bccbbeea1d8bc28580dec36387fb1d165f Mon Sep 17 00:00:00 2001 From: Marco Zanon Date: Thu, 12 Jan 2017 11:13:13 +0000 Subject: [PATCH] Fixed a bug which prevented the connection pool to return a connection when minimum size was set to 0. --- .../macaco/database/MDatabaseConnectionPool.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/java/com/marcozanon/macaco/database/MDatabaseConnectionPool.java b/src/java/com/marcozanon/macaco/database/MDatabaseConnectionPool.java index 16e586e..1c992cd 100644 --- a/src/java/com/marcozanon/macaco/database/MDatabaseConnectionPool.java +++ b/src/java/com/marcozanon/macaco/database/MDatabaseConnectionPool.java @@ -69,7 +69,13 @@ public class MDatabaseConnectionPool extends MObject { public synchronized MDatabaseConnection popDatabaseConnection() throws MDatabaseConnectionFailureException { LinkedList databaseConnections = this.getDatabaseConnections(); - MDatabaseConnection databaseConnection = databaseConnections.removeLast(); + MDatabaseConnection databaseConnection = null; + if (0 == databaseConnections.size()) { + databaseConnection = this.getDatabaseConnectionGenerator().getNewDatabaseConnection(); + } + else { + databaseConnection = databaseConnections.removeLast(); + } if (this.getMinimumSize() > databaseConnections.size()) { databaseConnections.add(this.getDatabaseConnectionGenerator().getNewDatabaseConnection()); } -- 2.30.2