Repository: cloudstack Updated Branches: refs/heads/4.3 12aef675c -> 6a07aed6d
fixed NPE (cherry picked from commit 98b416b7f07220cc765be14e30382feb25dd3e75) Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a07aed6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a07aed6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a07aed6 Branch: refs/heads/4.3 Commit: 6a07aed6db0cb8f8e19ae5ec8e5b86ca353d33e2 Parents: 12aef67 Author: Anthony Xu <anthony...@citrix.com> Authored: Wed Oct 29 17:05:42 2014 -0700 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Thu Feb 5 12:15:28 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/6a07aed6/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 18ccbc9..06c34f9 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -2052,7 +2052,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; }
