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 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;