fixed NPE

Anthony Xu · Anthony Xu · commit c78f14cbc2fd · 2014-10-29T17:05:42.000-07:00
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -2101,7 +2101,7 @@ private boolean doCancelMaintenance(long hostId) {
         _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;
             }

Original file line number	Diff line number	Diff line change
`@@ -2101,7 +2101,7 @@ private boolean doCancelMaintenance(long hostId) {`
`2101`	`2101`	`_haMgr.cancelScheduledMigrations(host);`
`2102`	`2102`	`List<VMInstanceVO> vms = _haMgr.findTakenMigrationWork();`
`2103`	`2103`	`for (VMInstanceVO vm : vms) {`
`2104`		`- if (vm.getHostId() != null && vm.getHostId() == hostId) {`
	`2104`	`+ if (vm != null && vm.getHostId() != null && vm.getHostId() == hostId) {`
`2105`	`2105`	`s_logger.info("Unable to cancel migration because the vm is being migrated: " + vm);`
`2106`	`2106`	`return false;`
`2107`	`2107`	`}`