antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

partly reverted 5f18e3ae2d:

Browse source 
switched back to using DbSources as Map keys, as using strings breaks switching databases
using DbSource.switchProperties (which is used in jala.Test)
This commit is contained in:
Robert Gaggl 2013-04-09 16:05:07 +02:00
parent 5f18e3ae2d
commit 61bafb72d6
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/helma/objectmodel/db/Transactor.java
View file

@ -52,10 +52,10 @@ public class Transactor {
protected ITransaction txn; protected ITransaction txn;
// Transactions for SQL data sources // Transactions for SQL data sources
private Map<String, Connection> sqlConnections; private Map<DbSource, Connection> sqlConnections;
// Set of SQL connections that already have been verified // Set of SQL connections that already have been verified
private Map<String, Long> testedConnections; private Map<DbSource, Long> testedConnections;
// when did the current transaction start? // when did the current transaction start?
private long tstart; private long tstart;
@ -81,8 +81,8 @@ public class Transactor {
cleanNodes = new HashMap(); cleanNodes = new HashMap();
parentNodes = new HashSet(); parentNodes = new HashSet();
sqlConnections = new HashMap<String, Connection>(); sqlConnections = new HashMap<DbSource, Connection>();
testedConnections = new HashMap<String, Long>(); testedConnections = new HashMap<DbSource, Long>();
active = false; active = false;
killed = false; killed = false;
} }
@ -238,9 +238,9 @@ public class Transactor {
* @param con the connection * @param con the connection
*/ */
public void registerConnection(DbSource src, Connection con) { public void registerConnection(DbSource src, Connection con) {
sqlConnections.put(src.getName(), con); sqlConnections.put(src, con);
// we assume a freshly created connection is ok. // we assume a freshly created connection is ok.
testedConnections.put(src.getName(), new Long(System.currentTimeMillis())); testedConnections.put(src, new Long(System.currentTimeMillis()));
} }
/** /**
@ -249,8 +249,8 @@ public class Transactor {
* @return the connection * @return the connection
*/ */
public Connection getConnection(DbSource src) { public Connection getConnection(DbSource src) {
Connection con = sqlConnections.get(src.getName()); Connection con = sqlConnections.get(src);
Long tested = testedConnections.get(src.getName()); Long tested = testedConnections.get(src);
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
if (con != null && (tested == null || now - tested.longValue() > 60000)) { if (con != null && (tested == null || now - tested.longValue() > 60000)) {
// Check if the connection is still alive by executing a simple statement. // Check if the connection is still alive by executing a simple statement.
@ -262,7 +262,7 @@ public class Transactor {
stmt.execute("SELECT 1"); stmt.execute("SELECT 1");
} }
stmt.close(); stmt.close();
testedConnections.put(src.getName(), new Long(now)); testedConnections.put(src, new Long(now));
} catch (SQLException sx) { } catch (SQLException sx) {
try { try {
con.close(); con.close();