From 16cec3cad5e778b370edcbf421bf38e2fcd5f54e Mon Sep 17 00:00:00 2001 From: Marco Zanon Date: Wed, 28 Oct 2015 14:01:12 +0000 Subject: [PATCH] Renamed MSqlConnectionPool.getConnection() to getNewConnection(). --- src/java/com/marcozanon/macaco/logging/MLogDatabaseTable.java | 2 +- .../com/marcozanon/macaco/sql/MSqlConnectionGenerator.java | 2 +- src/java/com/marcozanon/macaco/sql/MSqlConnectionPool.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/com/marcozanon/macaco/logging/MLogDatabaseTable.java b/src/java/com/marcozanon/macaco/logging/MLogDatabaseTable.java index 5c4610b..71d9f34 100644 --- a/src/java/com/marcozanon/macaco/logging/MLogDatabaseTable.java +++ b/src/java/com/marcozanon/macaco/logging/MLogDatabaseTable.java @@ -108,7 +108,7 @@ public class MLogDatabaseTable extends MLogTarget { } // if (null == this.getSqlConnectionReference()) { - this.sqlConnection = this.getSqlConnectionGeneratorReference().getConnection(); + this.sqlConnection = this.getSqlConnectionGeneratorReference().getNewConnection(); } // LinkedHashMap p = new LinkedHashMap(); diff --git a/src/java/com/marcozanon/macaco/sql/MSqlConnectionGenerator.java b/src/java/com/marcozanon/macaco/sql/MSqlConnectionGenerator.java index 79f0a67..0bf6227 100644 --- a/src/java/com/marcozanon/macaco/sql/MSqlConnectionGenerator.java +++ b/src/java/com/marcozanon/macaco/sql/MSqlConnectionGenerator.java @@ -66,7 +66,7 @@ public class MSqlConnectionGenerator extends MObject { /* Generator. */ - public MSqlConnection getConnection() throws MSqlConnectionFailureException { + public MSqlConnection getNewConnection() throws MSqlConnectionFailureException { return new MSqlConnection(this.getDriver(), this.getUrl(), this.getUsername(), this.getPassword()); } diff --git a/src/java/com/marcozanon/macaco/sql/MSqlConnectionPool.java b/src/java/com/marcozanon/macaco/sql/MSqlConnectionPool.java index 4a5e24f..36c5be3 100644 --- a/src/java/com/marcozanon/macaco/sql/MSqlConnectionPool.java +++ b/src/java/com/marcozanon/macaco/sql/MSqlConnectionPool.java @@ -61,7 +61,7 @@ public class MSqlConnectionPool extends MObject { protected void initializeConnectionPool() throws MSqlConnectionFailureException { for (int c = 0; c < this.getMinimumSize(); c++) { - MSqlConnection connection = this.getConnectionGenerator().getConnection(); + MSqlConnection connection = this.getConnectionGenerator().getNewConnection(); this.getConnectionPool().add(connection); } } @@ -70,7 +70,7 @@ public class MSqlConnectionPool extends MObject { LinkedList connectionPool = this.getConnectionPool(); MSqlConnection connection = connectionPool.removeLast(); if (this.getMinimumSize() > connectionPool.size()) { - connectionPool.add(this.getConnectionGenerator().getConnection()); + connectionPool.add(this.getConnectionGenerator().getNewConnection()); } return connection; } -- 2.30.2