Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0C77310993 for ; Wed, 22 Jan 2014 19:28:52 +0000 (UTC) Received: (qmail 66839 invoked by uid 500); 22 Jan 2014 19:27:48 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 66253 invoked by uid 500); 22 Jan 2014 19:27:38 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 65735 invoked by uid 99); 22 Jan 2014 19:27:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jan 2014 19:27:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D35998A05C0; Wed, 22 Jan 2014 19:27:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: commits@cloudstack.apache.org Date: Wed, 22 Jan 2014 19:27:47 -0000 Message-Id: <0475586240934905ab5adfacafc0bc3f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [22/53] [abbrv] git commit: updated refs/heads/rbac to 33cd1ab 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/rbac Commit: 90e945fd741008ab706521b5c2d2c21cb6aab958 Parents: 452c20b Author: Mike Tutkowski Authored: Mon Jan 20 16:25:39 2014 -0700 Committer: Mike Tutkowski 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) {