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 AAC1EDAB6 for ; Sun, 19 May 2013 12:05:40 +0000 (UTC) Received: (qmail 91416 invoked by uid 500); 19 May 2013 12:05:37 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 91108 invoked by uid 500); 19 May 2013 12:05:36 -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 89766 invoked by uid 99); 19 May 2013 12:05:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 May 2013 12:05:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CC818319A9C; Sun, 19 May 2013 12:05:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sateesh@apache.org To: commits@cloudstack.apache.org Date: Sun, 19 May 2013 12:05:45 -0000 Message-Id: In-Reply-To: <036ed2f8bb0f40928d98a7f5ca7962eb@git.apache.org> References: <036ed2f8bb0f40928d98a7f5ca7962eb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/50] [abbrv] git commit: updated refs/heads/vmware-datamodel to d07f875 CLOUDSTACK-2544: Fix NPE while comparing lastHostId during capacity calculation Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d078f921 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d078f921 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d078f921 Branch: refs/heads/vmware-datamodel Commit: d078f921671d0f28d9291fa2bffa8a7eab53cda7 Parents: f441582 Author: Kishan Kavala Authored: Thu May 16 19:12:42 2013 +0530 Committer: Kishan Kavala Committed: Thu May 16 19:14:41 2013 +0530 ---------------------------------------------------------------------- .../com/cloud/capacity/CapacityManagerImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d078f921/server/src/com/cloud/capacity/CapacityManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java index e7101c6..b241989 100755 --- a/server/src/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java @@ -681,7 +681,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, if ((newState == State.Starting || newState == State.Migrating || event == Event.AgentReportMigrated) && vm.getHostId() != null) { boolean fromLastHost = false; - if (vm.getLastHostId().equals(vm.getHostId())) { + if (vm.getHostId().equals(vm.getLastHostId())) { s_logger.debug("VM starting again on the last host it was stopped on"); fromLastHost = true; }