cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: updated refs/heads/master to 35b5df6
Date Mon, 19 Aug 2013 05:21:01 GMT
Updated Branches:
  refs/heads/master c9e42b462 -> 35b5df61c


CLOUDSTACK-4384: Switch back to CLOUD_DB after simulator processing

Simulator should revert back to CLOUD_DB after its operations on
SIMULATOR_DB or the cloudstack connections go to the simulator instead
of cloud.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 3d39716c8fed2b27edbd4475a7e0915b1200123c)


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

Branch: refs/heads/master
Commit: 35b5df61c03c54d1df5de18b9ba581b7dabab5ed
Parents: c9e42b4
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Mon Aug 19 10:39:54 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Mon Aug 19 10:40:55 2013 +0530

----------------------------------------------------------------------
 .../src/com/cloud/agent/manager/SimulatorManagerImpl.java          | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35b5df61/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
index bcd4200..f6bd2b6 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
@@ -427,6 +427,8 @@ public class SimulatorManagerImpl extends ManagerBase implements SimulatorManage
             throw new CloudRuntimeException("Unable to configure simulator because of " +
ex.getMessage(), ex);
         } finally {
             txn.close();
+            txn = Transaction.open(Transaction.CLOUD_DB);
+            txn.close();
         }
         return true;
     }


Mime
View raw message