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

Conflicts:

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

diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index ee8d231f81a..79c67d05fe8 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -931,7 +931,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) {
@@ -1009,13 +1009,8 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
             s_logger.warn("Unable to release storage resources.", e);
         }
 
-        vm.setReservationId(null);
-
         try {
-            if (!forced)
-                return stateTransitTo(vm, Event.OperationSucceeded, null);
-            else 
-                return true;
+            return stateTransitTo(vm, Event.OperationSucceeded, null, null);
         } catch (NoTransitionException e) {
             s_logger.warn(e.getMessage());
             return false;