cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/4.5 to 98b416b
Date Thu, 05 Feb 2015 06:40:22 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 bf17f640c -> 98b416b7f


fixed NPE

(cherry picked from commit c78f14cbc2fd45fc587f4a238c0a0bfc1d753be8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/98b416b7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/98b416b7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/98b416b7

Branch: refs/heads/4.5
Commit: 98b416b7f07220cc765be14e30382feb25dd3e75
Parents: bf17f64
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Wed Oct 29 17:05:42 2014 -0700
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Thu Feb 5 12:10:09 2015 +0530

----------------------------------------------------------------------
 server/src/com/cloud/resource/ResourceManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98b416b7/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index 5723196..430a516 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -2107,7 +2107,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         _haMgr.cancelScheduledMigrations(host);
         List<VMInstanceVO> vms = _haMgr.findTakenMigrationWork();
         for (VMInstanceVO vm : vms) {
-            if (vm.getHostId() != null && vm.getHostId() == hostId) {
+            if (vm != null && vm.getHostId() != null && vm.getHostId() ==
hostId) {
                 s_logger.info("Unable to cancel migration because the vm is being migrated:
" + vm);
                 return false;
             }


Mime
View raw message