Fix NPE scenario i noticed on the qa-refapp server

openmrs · Dec 31, 2023 · 8ab2b7e · 8ab2b7e
1 parent 0004537
commit 8ab2b7e
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/omod/src/main/java/org/openmrs/web/controller/report/CohortReportFormController.java b/omod/src/main/java/org/openmrs/web/controller/report/CohortReportFormController.java
@@ -391,14 +391,13 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 	}
 
 	private Node findChild(Node parent, String name) {
-		if (parent == null) {
-			return null;
-		}
-		NodeList list = parent.getChildNodes();
-		for (int i = 0; i < list.getLength(); ++i) {
-			Node node = list.item(i);
-			if (node.getNodeName().equals(name))
-				return node;
+		if (parent != null) {
+			NodeList list = parent.getChildNodes();
+			for (int i = 0; i < list.getLength(); ++i) {
+				Node node = list.item(i);
+				if (node.getNodeName().equals(name))
+					return node;
+			}
 		}
 		return null;
 	}