You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/10/30 01:06:11 UTC
git commit: updated refs/heads/master to c78f14c
Repository: cloudstack
Updated Branches:
refs/heads/master 9d5b7b73a -> c78f14cbc
fixed NPE
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c78f14cb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c78f14cb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c78f14cb
Branch: refs/heads/master
Commit: c78f14cbc2fd45fc587f4a238c0a0bfc1d753be8
Parents: 9d5b7b7
Author: Anthony Xu <an...@citrix.com>
Authored: Wed Oct 29 17:05:42 2014 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Wed Oct 29 17:05:42 2014 -0700
----------------------------------------------------------------------
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/c78f14cb/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 c7ba80a..a3413eb 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -2101,7 +2101,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;
}