From: <jef...@us...> - 2012-09-30 23:46:05
|
Revision: 1257 http://dbunit.svn.sourceforge.net/dbunit/?rev=1257&view=rev Author: jeffjensen Date: 2012-09-30 23:45:58 +0000 (Sun, 30 Sep 2012) Log Message: ----------- [3542576] Calls to JdbcDatabaseTester getConnection return new connect Modified Paths: -------------- trunk/dbunit/src/changes/changes.xml trunk/dbunit/src/main/java/org/dbunit/JdbcDatabaseTester.java Modified: trunk/dbunit/src/changes/changes.xml =================================================================== --- trunk/dbunit/src/changes/changes.xml 2012-09-30 23:22:55 UTC (rev 1256) +++ trunk/dbunit/src/changes/changes.xml 2012-09-30 23:45:58 UTC (rev 1257) @@ -11,6 +11,7 @@ <body> <release version="next" date="in SCM" description=""> + <action dev="jeffjensen" type="fix" issue="3542576" due-to="(unknown)">Calls to JdbcDatabaseTester getConnection return new connect.</action> <action dev="jeffjensen" type="fix" issue="3545861" due-to="artbristol">CsvURLProducer swallows exception stack.</action> <action dev="jeffjensen" type="fix" issue="3554287" due-to="statalex">Trim CSV file column names.</action> </release> Modified: trunk/dbunit/src/main/java/org/dbunit/JdbcDatabaseTester.java =================================================================== --- trunk/dbunit/src/main/java/org/dbunit/JdbcDatabaseTester.java 2012-09-30 23:22:55 UTC (rev 1256) +++ trunk/dbunit/src/main/java/org/dbunit/JdbcDatabaseTester.java 2012-09-30 23:45:58 UTC (rev 1257) @@ -48,6 +48,7 @@ private String driverClass; private String password; private String username; + private IDatabaseConnection dbconnection = null; /** * Creates a new JdbcDatabaseTester with the specified properties.<br> @@ -107,15 +108,17 @@ public IDatabaseConnection getConnection() throws Exception { logger.debug("getConnection() - start"); - - assertNotNullNorEmpty( "connectionUrl", connectionUrl ); - Connection conn = null; - if( username == null && password == null ){ - conn = DriverManager.getConnection( connectionUrl ); - }else{ - conn = DriverManager.getConnection( connectionUrl, username, password ); + if(dbconnection == null){ + assertNotNullNorEmpty( "connectionUrl", connectionUrl ); + Connection conn = null; + if( username == null && password == null ){ + conn = DriverManager.getConnection( connectionUrl ); + }else{ + conn = DriverManager.getConnection( connectionUrl, username, password ); + } + dbconnection = new DatabaseConnection( conn, getSchema() ); } - return new DatabaseConnection( conn, getSchema() ); + return dbconnection; } public String toString() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |