Repository: cayenne Updated Branches: refs/heads/master 12e83f21b -> 19e42c1b1
CAY-2009 Non-blocking connection pool * fixing logger init bug Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/19e42c1b Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/19e42c1b Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/19e42c1b Branch: refs/heads/master Commit: 19e42c1b1566520dee781cb648106f4e2751230f Parents: 12e83f2 Author: aadamchik <[email protected]> Authored: Tue May 19 10:44:16 2015 +0300 Committer: aadamchik <[email protected]> Committed: Tue May 19 10:44:16 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/cayenne/datasource/DataSourceBuilder.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/19e42c1b/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 4576f61..ee281ba 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 @@ -28,8 +28,8 @@ import org.apache.cayenne.log.JdbcEventLogger; import org.apache.cayenne.log.NoopJdbcEventLogger; /** - * A builder class that creates a default Cayenne implementation of a pooling - * {@link DataSource}. + * A builder class that allows to build a {@link DataSource} with optional + * pooling. * * @since 4.0 */ @@ -49,8 +49,7 @@ public class DataSourceBuilder { private DataSourceBuilder(AdhocObjectFactory objectFactory, JdbcEventLogger logger) { this.objectFactory = objectFactory; - this.logger = logger; - this.logger = NoopJdbcEventLogger.getInstance(); + this.logger = logger != null ? logger : NoopJdbcEventLogger.getInstance(); this.poolParameters = new PoolingDataSourceParameters(); poolParameters.setMinConnections(1);
