Repository: cloudstack Updated Branches: refs/heads/4.4 58a4c7a89 -> 92d1428c4
CLOUDSTACK-6595: allow to expunge the vm when its in Error state, in addition to Expunging/Destroyed states (cherry picked from commit 822b38761f1655ef3d5d3648985a197f5c2c1262) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/92d1428c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/92d1428c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/92d1428c Branch: refs/heads/4.4 Commit: 92d1428c480d013cc153b19b62a9a130258d1504 Parents: 58a4c7a Author: Alena Prokharchyk <[email protected]> Authored: Mon Jul 14 14:02:41 2014 -0700 Committer: Daan Hoogland <[email protected]> Committed: Thu Jul 17 09:49:29 2014 +0200 ---------------------------------------------------------------------- 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/92d1428c/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 96892ae..b3a5054 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -3670,7 +3670,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;
