Updated Branches: refs/heads/master 452c20b24 -> 90e945fd7
Fixing an issue with expunge logic Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/90e945fd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/90e945fd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/90e945fd Branch: refs/heads/master Commit: 90e945fd741008ab706521b5c2d2c21cb6aab958 Parents: 452c20b Author: Mike Tutkowski <[email protected]> Authored: Mon Jan 20 16:25:39 2014 -0700 Committer: Mike Tutkowski <[email protected]> Committed: Mon Jan 20 16:25:39 2014 -0700 ---------------------------------------------------------------------- .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90e945fd/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index 174253a..301ff47 100755 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -492,7 +492,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac Long hostId = vm.getHostId() != null ? vm.getHostId() : vm.getLastHostId(); - if (volumeExpungeCommands != null && hostId != null) { + if (volumeExpungeCommands != null && volumeExpungeCommands.size() > 0 && hostId != null) { Commands cmds = new Commands(Command.OnError.Stop); for (Command volumeExpungeCommand : volumeExpungeCommands) {
