You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2015/12/04 12:33:31 UTC

cayenne git commit: CAY-2041 | "cayenne.jdbc.max_connections" and "cayenne.jdbc.min_connections" command line options are ignored

Repository: cayenne
Updated Branches:
  refs/heads/master 5bb12cd36 -> 89251d062


CAY-2041 | "cayenne.jdbc.max_connections" and "cayenne.jdbc.min_connections" command line options are ignored


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/89251d06
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/89251d06
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/89251d06

Branch: refs/heads/master
Commit: 89251d0627472954d9787018c403df6bb1412b1f
Parents: 5bb12cd
Author: evintik <ev...@objectstyle.com>
Authored: Thu Dec 3 16:49:06 2015 +0300
Committer: evintik <ev...@objectstyle.com>
Committed: Thu Dec 3 16:49:06 2015 +0300

----------------------------------------------------------------------
 .../org/apache/cayenne/datasource/DataSourceBuilder.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/89251d06/cayenne-server/src/main/java/org/apache/cayenne/datasource/DataSourceBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/datasource/DataSourceBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/datasource/DataSourceBuilder.java
index e8c8104..2873a0e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/datasource/DataSourceBuilder.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/datasource/DataSourceBuilder.java
@@ -18,11 +18,10 @@
  ****************************************************************/
 package org.apache.cayenne.datasource;
 
-import java.sql.Driver;
+import org.apache.cayenne.CayenneRuntimeException;
 
 import javax.sql.DataSource;
-
-import org.apache.cayenne.CayenneRuntimeException;
+import java.sql.Driver;
 
 /**
  * A builder class that allows to build a {@link DataSource} with optional
@@ -73,7 +72,9 @@ public class DataSourceBuilder {
 	 * Turns produced DataSource into a pooled DataSource.
 	 */
 	public PoolingDataSourceBuilder pool(int minConnection, int maxConnections) {
-		return new PoolingDataSourceBuilder(this);
+		return new PoolingDataSourceBuilder(this)
+				.minConnections(minConnection)
+				.maxConnections(maxConnections);
 	}
 
 	/**