etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 10447: don't set the reservation id to null

This commit is contained in:
Alex Huang 2011-07-08 11:36:30 -07:00
parent e00c011dcb
commit 040cffafca
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

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