From: Marco Zanon <info@marcozanon.com>
Date: Thu, 12 Jan 2017 11:13:13 +0000 (+0000)
Subject: Fixed a bug which prevented the connection pool to return a connection when minimum... 
X-Git-Tag: 4.2.1~2
X-Git-Url: https://gitweb.marcozanon.com/?a=commitdiff_plain;h=bce177bccbbeea1d8bc28580dec36387fb1d165f;p=Macaco

Fixed a bug which prevented the connection pool to return a connection when minimum size was set to 0.
---

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