[Engine-patches] Change in ovirt-engine[master]: coverity: Fix NULL_RETURNS error in CpuLevelFilterPolicyUnit

[tnisan]

Tal Nisan has uploaded a new change for review.

Change subject: coverity: Fix NULL_RETURNS error in CpuLevelFilterPolicyUnit
......................................................................

coverity: Fix NULL_RETURNS error in CpuLevelFilterPolicyUnit

Change-Id: I732c1b272d6a8c1da871a4e41c484eb36c1a4e62
Signed-off-by: Tal Nisan <tni...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuLevelFilterPolicyUnit.java
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/27207/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuLevelFilterPolicyUnit.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuLevelFilterPolicyUnit.java
index 68cf380..67300a5 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuLevelFilterPolicyUnit.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuLevelFilterPolicyUnit.java
@@ -3,6 +3,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.bll.CpuFlagsManagerHandler;
 import org.ovirt.engine.core.bll.scheduling.PolicyUnitImpl;
+import org.ovirt.engine.core.common.businessentities.ServerCpu;
 import org.ovirt.engine.core.common.businessentities.VDS;
 import org.ovirt.engine.core.common.businessentities.VM;
 import org.ovirt.engine.core.common.errors.VdcBllMessages;
@@ -23,7 +24,8 @@
         if (StringUtils.isNotEmpty(vm.getCpuName())) {
             List<VDS> hostsToRunOn = new ArrayList<VDS>();
             for (VDS host : hosts) {
-                String hostCpuName = 
CpuFlagsManagerHandler.FindMaxServerCpuByFlags(host.getCpuFlags(), 
host.getVdsGroupCompatibilityVersion()).getCpuName();
+                ServerCpu cpu = 
CpuFlagsManagerHandler.FindMaxServerCpuByFlags(host.getCpuFlags(), 
host.getVdsGroupCompatibilityVersion());
+                String hostCpuName = cpu == null ? null : cpu.getCpuName();
                 if (StringUtils.isNotEmpty(hostCpuName)) {
                     int compareResult = 
CpuFlagsManagerHandler.compareCpuLevels(vm.getCpuName(), hostCpuName, 
vm.getVdsGroupCompatibilityVersion());
                     if (compareResult <= 0) {


-- 
To view, visit http://gerrit.ovirt.org/27207
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I732c1b272d6a8c1da871a4e41c484eb36c1a4e62
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tni...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches