Make the OvfOvirtReader disk read more robust

Some OVA files might miss one (or more) of the attributes. This might result in NullPointerException. This change will make the disk read to be more robust and prevent the exception. Signed-off-by: Liran Rotenberg <lrotenbe@redhat.com>
oVirt · Nov 13, 2023 · ff7f34a · ff7f34a
1 parent 504baab
commit ff7f34a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...d/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfOvirtReader.java b/...d/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfOvirtReader.java
@@ -260,10 +260,10 @@ public void buildDisk() {
     protected void readDisk(XmlNode node, DiskImage image) {
         super.readDisk(node, image);
 
-        if (!StringUtils.isEmpty(node.attributes.get("ovf:size").getValue())) {
+        if (node.attributes.get("ovf:size").getValue() != null && !StringUtils.isEmpty(node.attributes.get("ovf:size").getValue())) {
             image.setSize(convertGigabyteToBytes(Long.parseLong(node.attributes.get("ovf:size").getValue())));
         }
-        if (!StringUtils.isEmpty(node.attributes.get("ovf:actual_size").getValue())) {
+        if (node.attributes.get("ovf:actual_size").getValue() != null && !StringUtils.isEmpty(node.attributes.get("ovf:actual_size").getValue())) {
             image.setActualSizeInBytes(
                     convertGigabyteToBytes(Long.parseLong(node.attributes.get("ovf:actual_size").getValue())));
         }