From 84caa636cfab8bf02321e1859de968263d5fee5a Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Mon, 27 Aug 2012 14:38:21 -0400 Subject: [PATCH] Get rid of the concierge holding standalone connection --- .../src/com/cloud/agent/manager/SimulatorManagerImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/agent-simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java b/agent-simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java index a2d662f7022..b980939e387 100644 --- a/agent-simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java +++ b/agent-simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java @@ -109,6 +109,7 @@ public class SimulatorManagerImpl implements SimulatorManager { private ConnectionConcierge _concierge; @Override public boolean configure(String name, Map params) throws ConfigurationException { + /* try { Connection conn = Transaction.getStandaloneConnectionWithException(); conn.setAutoCommit(true); @@ -116,6 +117,7 @@ public class SimulatorManagerImpl implements SimulatorManager { } catch (SQLException e) { throw new CloudRuntimeException("Unable to get a db connection", e); } + */ return true; } @@ -152,8 +154,8 @@ public class SimulatorManagerImpl implements SimulatorManager { @DB @Override public Answer simulate(Command cmd, String hostGuid) { - Transaction txn = Transaction.currentTxn(); - txn.transitToUserManagedConnection(_concierge.conn()); + Transaction txn = Transaction.open(Transaction.SIMULATOR_DB); + // txn.transitToUserManagedConnection(_concierge.conn()); try { MockHost host = _mockHost.findByGuid(hostGuid);