From dc605655a0533f08e1b5977d03f8e4194ca8c121 Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Mon, 20 Jun 2011 16:20:37 -0700
Subject: [PATCH] removed useless manager declarations

---
 .../com/cloud/configuration/DefaultComponentLibrary.java    | 6 ------
 server/src/com/cloud/vm/VirtualMachineManagerImpl.java      | 6 +++---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/server/src/com/cloud/configuration/DefaultComponentLibrary.java b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
index 14efcc9659d..2bf2b978c12 100644
--- a/server/src/com/cloud/configuration/DefaultComponentLibrary.java
+++ b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
@@ -38,7 +38,6 @@ import com.cloud.certificate.dao.CertificateDaoImpl;
 import com.cloud.cluster.CheckPointManagerImpl;
 import com.cloud.cluster.ClusterFenceManagerImpl;
 import com.cloud.cluster.ClusterManagerImpl;
-import com.cloud.cluster.DummyClusterManagerImpl;
 import com.cloud.cluster.ManagementServerNode;
 import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl;
 import com.cloud.cluster.dao.ManagementServerHostDaoImpl;
@@ -46,7 +45,6 @@ import com.cloud.cluster.dao.StackMaidDaoImpl;
 import com.cloud.configuration.dao.ConfigurationDaoImpl;
 import com.cloud.configuration.dao.ResourceCountDaoImpl;
 import com.cloud.configuration.dao.ResourceLimitDaoImpl;
-import com.cloud.consoleproxy.AgentBasedStandaloneConsoleProxyManager;
 import com.cloud.consoleproxy.ConsoleProxyManagerImpl;
 import com.cloud.dao.EntityManager;
 import com.cloud.dao.EntityManagerImpl;
@@ -151,7 +149,6 @@ import com.cloud.utils.db.GenericDao;
 import com.cloud.vm.ClusteredVirtualMachineManagerImpl;
 import com.cloud.vm.ItWorkDaoImpl;
 import com.cloud.vm.UserVmManagerImpl;
-import com.cloud.vm.VirtualMachineManagerImpl;
 import com.cloud.vm.dao.ConsoleProxyDaoImpl;
 import com.cloud.vm.dao.DomainRouterDaoImpl;
 import com.cloud.vm.dao.InstanceGroupDaoImpl;
@@ -295,12 +292,10 @@ public class DefaultComponentLibrary extends ComponentLibraryBase implements Com
         addManager("download manager", DownloadMonitorImpl.class);
         addManager("upload manager", UploadMonitorImpl.class);
         addManager("keystore manager", KeystoreManagerImpl.class);
-        addManager("console proxy manager", AgentBasedStandaloneConsoleProxyManager.class);
         addManager("secondary storage vm manager", SecondaryStorageManagerImpl.class);
         addManager("vm manager", UserVmManagerImpl.class);
         addManager("upgrade manager", UpgradeManagerImpl.class);
         addManager("StorageManager", StorageManagerImpl.class);
-        addManager("Cluster Manager", DummyClusterManagerImpl.class);
         addManager("SyncQueueManager", SyncQueueManagerImpl.class);
         addManager("AsyncJobManager", AsyncJobManagerImpl.class);
         addManager("AsyncJobExecutorContext", AsyncJobExecutorContextImpl.class);
@@ -310,7 +305,6 @@ public class DefaultComponentLibrary extends ComponentLibraryBase implements Com
         addManager("Snapshot Manager", SnapshotManagerImpl.class);
         addManager("SnapshotScheduler", SnapshotSchedulerImpl.class);
         addManager("SecurityGroupManager", SecurityGroupManagerImpl.class);
-        addManager("VmManager", VirtualMachineManagerImpl.class);
         addManager("DomainRouterManager", VirtualNetworkApplianceManagerImpl.class);
         addManager("EntityManager", EntityManagerImpl.class);
         addManager("LoadBalancingRulesManager", LoadBalancingRulesManagerImpl.class);
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index e342f38869c..e84e73930ea 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -509,14 +509,14 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
                     if (s_logger.isDebugEnabled()) {
                         s_logger.debug("Successfully transitioned to start state for " + vm + " reservation id = " + work.getId());
                     }
-                    return new Ternary<T, ReservationContext, ItWorkVO>(vmGuru.findById(vmId), context, work);
+                    Ternary<T, ReservationContext, ItWorkVO> result = new Ternary<T, ReservationContext, ItWorkVO>(vmGuru.findById(vmId), context, work);
+                    txn.commit();
+                    return result;
                 }
             } catch (NoTransitionException e) {
                 if (s_logger.isDebugEnabled()) {
                     s_logger.debug("Unable to transition into Starting state due to " + e.getMessage());
                 }
-            } finally {
-                txn.commit();
             }
 
             VMInstanceVO instance = _vmDao.findById(vmId);