Yair Zaslavsky has uploaded a new change for review.

Change subject: core: fix potential NPE at VmDeviceUtils
......................................................................

core: fix potential NPE at VmDeviceUtils

Change-Id: I6020055934913fc92829dd99dadbefd6fc3a0c05
Signed-off-by: Yair Zaslavsky <[email protected]>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/19515/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
index 4e7cda7..932d94d 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
@@ -290,7 +290,9 @@
                 // updating USB slots
                 updateUSBSlots(null, vmBase);
                 // add mem balloon if defined
-                updateMemoryBalloon(null, vmBase, vm.isBalloonEnabled());
+                if (isVm) {
+                    updateMemoryBalloon(null, vmBase, vm.isBalloonEnabled());
+                }
             }
 
             switch(device.getType()) {


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6020055934913fc92829dd99dadbefd6fc3a0c05
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to