Moti Asayag has uploaded a new change for review. Change subject: engine: Fix NPE when network qos is partially provided ......................................................................
engine: Fix NPE when network qos is partially provided The patch fixes NPE caused by autoboxing of a none-set network-qos attribute (i.e. inbound average). Change-Id: I483dbab4d5a2b89b5ee2290fdfe09f65ddfac0bd Bug-Url: https://bugzilla.redhat.com/1000810 Signed-off-by: Moti Asayag <masa...@redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/18676/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java index e31bb12..d67fe6e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java @@ -592,8 +592,12 @@ } } - private static void addQosData(Map<String, Object> specParams, String containerName, int average, int peak, int burst){ - if (average > 0) { + private static void addQosData(Map<String, Object> specParams, + String containerName, + Integer average, + Integer peak, + Integer burst) { + if (average != null && average > 0) { Map<String, String> qosData = new HashMap<>(); qosData.put(VdsProperties.QOS_AVERAGE, String.valueOf(average * MEGABITS_TO_KILOBYTES)); qosData.put(VdsProperties.QOS_PEAK, String.valueOf(peak * MEGABITS_TO_KILOBYTES)); -- To view, visit http://gerrit.ovirt.org/18676 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I483dbab4d5a2b89b5ee2290fdfe09f65ddfac0bd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masa...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
