Menu
▾
▴
[dbunit-commit] SF.net SVN: dbunit:[1259] trunk/dbunit/src
|
From: <jef...@us...> - 2012-10-20 01:50:51
|
Revision: 1259
http://dbunit.svn.sourceforge.net/dbunit/?rev=1259&view=rev
Author: jeffjensen
Date: 2012-10-20 01:50:45 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
Backout commit 1257 [3542576] Calls to JdbcDatabaseTester getConnection return new connect. It breaks all tests.
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-10-01 01:09:01 UTC (rev 1258)
+++ trunk/dbunit/src/changes/changes.xml 2012-10-20 01:50:45 UTC (rev 1259)
@@ -12,8 +12,6 @@
<body>
<release version="next" date="in SCM" description="">
<action dev="jeffjensen" type="add" issue="3499513" due-to="MPriess">Add Postgres Geometry Type.</action>
- <action dev="jeffjensen" type="fix" issue="" due-to="">.</action>
- <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-10-01 01:09:01 UTC (rev 1258)
+++ trunk/dbunit/src/main/java/org/dbunit/JdbcDatabaseTester.java 2012-10-20 01:50:45 UTC (rev 1259)
@@ -48,7 +48,6 @@
private String driverClass;
private String password;
private String username;
- private IDatabaseConnection dbconnection = null;
/**
* Creates a new JdbcDatabaseTester with the specified properties.<br>
@@ -108,17 +107,15 @@
public IDatabaseConnection getConnection() throws Exception
{
logger.debug("getConnection() - start");
- 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() );
+
+ assertNotNullNorEmpty( "connectionUrl", connectionUrl );
+ Connection conn = null;
+ if( username == null && password == null ){
+ conn = DriverManager.getConnection( connectionUrl );
+ }else{
+ conn = DriverManager.getConnection( connectionUrl, username, password );
}
- return dbconnection;
+ return new DatabaseConnection( conn, getSchema() );
}
public String toString()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
