You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/10/30 14:22:40 UTC
oodt git commit: OODT-906 fix null pointer
Repository: oodt
Updated Branches:
refs/heads/master 32a73087d -> cc372588e
OODT-906 fix null pointer
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/cc372588
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/cc372588
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/cc372588
Branch: refs/heads/master
Commit: cc372588ece06dd0dcb0ff4a0370aa5e5a573268
Parents: 32a7308
Author: Tom Barber <to...@analytical-labs.com>
Authored: Fri Oct 30 13:18:03 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Fri Oct 30 13:18:03 2015 +0000
----------------------------------------------------------------------
.../oodt/commons/database/DatabaseConnectionBuilder.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/cc372588/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java b/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java
index da55db8..fbb555a 100644
--- a/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java
+++ b/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java
@@ -19,6 +19,10 @@
package org.apache.oodt.commons.database;
//JDK imports
+
+import org.apache.commons.dbcp.ConnectionFactory;
+import org.apache.commons.dbcp.DriverManagerConnectionFactory;
+import org.apache.commons.dbcp.PoolableConnectionFactory;
import org.apache.commons.dbcp.PoolingDataSource;
import org.apache.commons.pool.impl.GenericObjectPool;
@@ -47,7 +51,10 @@ public final class DatabaseConnectionBuilder {
}
GenericObjectPool connectionPool = new GenericObjectPool(null);
-
+ ConnectionFactory connectionFactory = new DriverManagerConnectionFactory(
+ url, user, pass);
+ PoolableConnectionFactory poolableConnectionFactory = new PoolableConnectionFactory(
+ connectionFactory, connectionPool, null, null, false, true);
ds = new PoolingDataSource(connectionPool);
return ds;