From 040cffafca5100f57cba9f76cc177e788e7d550c Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Fri, 8 Jul 2011 11:36:30 -0700
Subject: [PATCH] bug 10447: don't set the reservation id to null

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

diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index e8a75cc865e..711bef8bbce 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -936,7 +936,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
         VirtualMachineGuru<T> vmGuru = getVmGuru(vm);
 
         try {
-            if (!stateTransitTo(vm, Event.StopRequested, vm.getHostId(), null)) {
+            if (!stateTransitTo(vm, Event.StopRequested, vm.getHostId())) {
                 throw new ConcurrentOperationException("VM is being operated on.");
             }
         } catch (NoTransitionException e1) {
@@ -958,6 +958,13 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
                         return false;
                     }
                 }
+            } else {
+                try {
+                    return stateTransitTo(vm, Event.AgentReportStopped, null);
+                } catch (NoTransitionException e) {
+                    s_logger.warn("Unable to cleanup " + vm);
+                    return false;
+                }
             }
         }