Repository: cloudstack Updated Branches: refs/heads/master e1095b011 -> 4f0640dac
CLOUDSTACK-6595: allow to expunge the vm when its in Error state, in addition to Expunging/Destroyed states Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f0640da Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f0640da Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f0640da Branch: refs/heads/master Commit: 4f0640dac4036d92bcda745c8fa80afcae5eae55 Parents: e1095b0 Author: Alena Prokharchyk <[email protected]> Authored: Mon Jul 14 14:02:41 2014 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Mon Jul 14 14:40:11 2014 -0700 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f0640da/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 3df05e0..dac4acf 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -3683,7 +3683,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir return vm; } - if ((vm.getState() != State.Destroyed) && (vm.getState() != State.Expunging)) { + if (!(vm.getState() == State.Destroyed || vm.getState() == State.Expunging || vm.getState() == State.Error)) { CloudRuntimeException ex = new CloudRuntimeException("Please destroy vm with specified vmId before expunge"); ex.addProxyObject(String.valueOf(vmId), "vmId"); throw ex;
