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 3B4549B19 for ; Thu, 16 May 2013 13:45:24 +0000 (UTC) Received: (qmail 82683 invoked by uid 500); 16 May 2013 13:45:24 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 82139 invoked by uid 500); 16 May 2013 13:45:20 -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 81577 invoked by uid 99); 16 May 2013 13:45:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 May 2013 13:45:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D03E714959; Thu, 16 May 2013 13:45:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kishan@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to d078f92 Date: Thu, 16 May 2013 13:45:08 +0000 (UTC) Updated Branches: refs/heads/master f441582e1 -> d078f9216 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/master 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; }