cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [38/39] git commit: updated refs/heads/ui-vpc-redesign to 8d9a8ca
Date Thu, 16 May 2013 17:12:59 GMT
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/ui-vpc-redesign
Commit: d078f921671d0f28d9291fa2bffa8a7eab53cda7
Parents: f441582
Author: Kishan Kavala <kishan@cloud.com>
Authored: Thu May 16 19:12:42 2013 +0530
Committer: Kishan Kavala <kishan@cloud.com>
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;
             }


Mime
View raw message