From 3ab96b99af5813d54fb811f7ba17fe056c39afba Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Mon, 27 Jun 2011 11:30:23 -0700
Subject: [PATCH] host is stucked in prepareMaintenance mode if you put last
 host into maintenance mode, fixed

---
 server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index a6b9f682b76..e4f595a5e7e 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -940,7 +940,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
         VirtualMachineGuru<T> vmGuru = getVmGuru(vm);
 
         try {
-            if (!stateTransitTo(vm, forced ? Event.AgentReportStopped : Event.StopRequested, vm.getHostId(), null)) {
+            if (!stateTransitTo(vm, Event.StopRequested, vm.getHostId(), null)) {
                 throw new ConcurrentOperationException("VM is being operated on.");
             }
         } catch (NoTransitionException e1) {
@@ -1018,10 +1018,8 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
             s_logger.warn("Unable to release storage resources.", e);
         }
 
-        vm.setReservationId(null);
-
         try {
-            return stateTransitTo(vm, Event.OperationSucceeded, null);
+            return stateTransitTo(vm, Event.OperationSucceeded, null, null);
         } catch (NoTransitionException e) {
             s_logger.warn(e.getMessage());
             return false;