From ddf9c6586d99e7fbad532352fd98187da53e7687 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 17 Jan 2013 19:06:54 -0800 Subject: [PATCH] Transaction: cosmetics fix The default data source assumption is that db server is on localhost, port 3306 and has user cloud and password cloud. The static variables rely on hardcoded db.properties file only. We need to fix it Signed-off-by: Rohit Yadav --- utils/src/com/cloud/utils/db/Transaction.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/utils/src/com/cloud/utils/db/Transaction.java b/utils/src/com/cloud/utils/db/Transaction.java index eaa31f6e2f5..bcb78d7fabb 100755 --- a/utils/src/com/cloud/utils/db/Transaction.java +++ b/utils/src/com/cloud/utils/db/Transaction.java @@ -1116,13 +1116,13 @@ public class Transaction { } private static DataSource getDefaultDataSource(final String database) { - final GenericObjectPool connectionPool = new GenericObjectPool(null, 5); - final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory( - "jdbc:mysql://localhost:3306/" + database, "cloud", "cloud"); - final PoolableConnectionFactory poolableConnectionFactory = new PoolableConnectionFactory( - connectionFactory, connectionPool, null, null, false, true); - return new PoolingDataSource( - /* connectionPool */poolableConnectionFactory.getPool()); + final GenericObjectPool connectionPool = new GenericObjectPool(null, 5); + final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory( + "jdbc:mysql://localhost:3306/" + database, "cloud", "cloud"); + final PoolableConnectionFactory poolableConnectionFactory = new PoolableConnectionFactory( + connectionFactory, connectionPool, null, null, false, true); + return new PoolingDataSource( + /* connectionPool */poolableConnectionFactory.getPool()); } }