cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [12/37] git commit: Get rid of the concierge holding standalone connection
Date Wed, 12 Sep 2012 13:24:10 GMT
Get rid of the concierge holding standalone connection


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/84caa636
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/84caa636
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/84caa636

Branch: refs/heads/master
Commit: 84caa636cfab8bf02321e1859de968263d5fee5a
Parents: 9d2cf01
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Mon Aug 27 14:38:21 2012 -0400
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Wed Sep 12 18:48:33 2012 +0530

----------------------------------------------------------------------
 .../cloud/agent/manager/SimulatorManagerImpl.java  |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/84caa636/agent-simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
----------------------------------------------------------------------
diff --git a/agent-simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java b/agent-simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
index a2d662f..b980939 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<String, Object> 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);


Mime
View raw message