potential null pointer in condition; AYAI9l8k5Irk9_td-cXb (#6237)

DaanHoogland · Daan Hoogland · web-flow · commit ee2ded82001a · 2022-04-11T16:07:11.000+05:30
Co-authored-by: Daan Hoogland &lt;dahn@onecht.net&gt;
diff --git a/api/src/main/java/com/cloud/agent/api/storage/OVFParser.java b/api/src/main/java/com/cloud/agent/api/storage/OVFParser.java
@@ -103,7 +103,7 @@ public String getChildNodeValue(Node node, String childNodeName) {
             Node value = childNodes.item(i);
             // Also match if the child's name has a suffix:
             // Example: <rasd:AllocationUnits>
-            if (value != null && (value.getNodeName().equals(childNodeName)) || value.getNodeName().endsWith(":" + childNodeName)) {
+            if (value != null && (value.getNodeName().equals(childNodeName) || value.getNodeName().endsWith(":" + childNodeName))) {
                 return value.getTextContent();
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public String getChildNodeValue(Node node, String childNodeName) {`
`103`	`103`	`Node value = childNodes.item(i);`
`104`	`104`	`// Also match if the child's name has a suffix:`
`105`	`105`	`// Example: <rasd:AllocationUnits>`
`106`		`- if (value != null && (value.getNodeName().equals(childNodeName)) \|\| value.getNodeName().endsWith(":" + childNodeName)) {`
	`106`	`+ if (value != null && (value.getNodeName().equals(childNodeName) \|\| value.getNodeName().endsWith(":" + childNodeName))) {`
`107`	`107`	`return value.getTextContent();`
`108`	`108`	`}`
`109`	`109`	`}`