[Engine-patches] Change in ovirt-engine[master]: core: prevent possible NPEs

[gchaplik]

Gilad Chaplik has uploaded a new change for review.

Change subject: core: prevent possible NPEs
......................................................................

core: prevent possible NPEs

For vm_static.numatune_mode

Change-Id: I977541f8c3e1aff44171fb1cede3047172adb9c5
Signed-off-by: Gilad Chaplik <gchap...@redhat.com>
---
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/27690/1

diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
index fd243bd..8e04f87 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
@@ -103,7 +103,9 @@
                 .addValue("serial_number_policy", vm.getSerialNumberPolicy() 
== null ? null : vm.getSerialNumberPolicy().getValue())
                 .addValue("custom_serial_number", vm.getCustomSerialNumber())
                 .addValue("is_boot_menu_enabled", vm.isBootMenuEnabled())
-                .addValue("numatune_mode", vm.getNumaTuneMode().getValue());
+                .addValue("numatune_mode",
+                        vm.getNumaTuneMode() == null ? 
NumaTuneMode.PREFERRED.getValue() : vm.getNumaTuneMode()
+                                .getValue());
     }
 
     @Override
diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
index 0960d8d..bae4e90 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
@@ -174,7 +174,7 @@
     private void addNumaSetting(final String compatibilityVersion) {
         if (Boolean.TRUE.equals(Config.<Boolean> 
getValue(ConfigValues.CpuPinningEnabled,
                         compatibilityVersion))) {
-            NumaTuneMode numaTune = vm.getNumaTuneMode();
+            NumaTuneMode numaTune = vm.getNumaTuneMode() == null ? 
NumaTuneMode.PREFERRED : vm.getNumaTuneMode();
             List<VmNumaNode> vmNumaNodes = 
DbFacade.getInstance().getVmNumaNodeDAO().getAllVmNumaNodeByVmId(vm.getId());
             List<VdsNumaNode> totalVdsNumaNodes = 
DbFacade.getInstance().getVdsNumaNodeDAO()
                     .getAllVdsNumaNodeByVdsId(vm.getRunOnVds());


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

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