[Engine-patches] Change in ovirt-engine[ovirt-engine-3.4]: core: [Fix] NPE in update vm/template (via rest)

[Gustavo Frederico Temple Pedrosa]

Gustavo Frederico Temple Pedrosa has uploaded a new change for review.

Change subject: core: [Fix] NPE in update vm/template (via rest)
......................................................................

core: [Fix] NPE in update vm/template (via rest)

Boolean null is casted to boolean.

Change-Id: If715acc7a0cbcf719f636cad6b9327f65cf3813c
Signed-off-by: Gustavo Pedrosa <gustavo.pedr...@eldorado.org.br>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
2 files changed, 14 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/23859/2

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
index 5586752..c202300 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
@@ -444,7 +444,7 @@
                 isVirtioScsiEnabled(),
                 hasWatchdog(),
                 getParameters().isBalloonEnabled(),
-                getParameters().isSoundDeviceEnabled(),
+                isSoundDeviceEnabled(),
                 getReturnValue().getCanDoActionMessages());
     }
 
@@ -609,6 +609,12 @@
                 VmDeviceUtils.isVirtioScsiControllerAttached(getVmId());
     }
 
+    protected boolean isSoundDeviceEnabled() {
+        Boolean soundDeviceEnabled = getParameters().isSoundDeviceEnabled();
+        return soundDeviceEnabled != null ? soundDeviceEnabled :
+                VmDeviceUtils.isSoundDeviceEnabled(getVmId());
+    }
+
     protected boolean hasWatchdog() {
         return getParameters().getWatchdog() != null;
     }
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
index ec50987..99474fc 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
@@ -137,7 +137,7 @@
                             
VmDeviceUtils.isVirtioScsiControllerAttached(getParameters().getVmTemplateData().getId()),
                             
hasWatchdog(getParameters().getVmTemplateData().getId()),
                             
VmDeviceUtils.isBalloonEnabled(getParameters().getVmTemplateData().getId()),
-                            getParameters().isSoundDeviceEnabled(),
+                            isSoundDeviceEnabled(),
                             getReturnValue().getCanDoActionMessages())) {
                 returnValue = false;
             }
@@ -159,6 +159,12 @@
         return getParameters().getWatchdog() != null;
     }
 
+    protected boolean isSoundDeviceEnabled() {
+        Boolean soundDeviceEnabled = getParameters().isSoundDeviceEnabled();
+        return soundDeviceEnabled != null ? soundDeviceEnabled :
+                
VmDeviceUtils.isSoundDeviceEnabled(getParameters().getVmTemplateData().getId());
+    }
+
     @Override
     protected void executeCommand() {
         VmHandler.warnMemorySizeLegal(getParameters().getVmTemplateData(),


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If715acc7a0cbcf719f636cad6b9327f65cf3813c
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Gustavo Frederico Temple Pedrosa <gustavo.pedr...@eldorado.org.br>
Gerrit-Reviewer: Allon Mureinik <amure...@redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchap...@redhat.com>
Gerrit-Reviewer: Gustavo Frederico Temple Pedrosa 
<gustavo.pedr...@eldorado.org.br>
Gerrit-Reviewer: Leonardo Bianconi <leonardo.bianc...@eldorado.org.br>
Gerrit-Reviewer: Martin Betak <mbe...@redhat.com>
Gerrit-Reviewer: Michal Skrivanek <michal.skriva...@redhat.com>
Gerrit-Reviewer: Vitor de Lima <vitor.l...@eldorado.org.br>
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches