Fix NPE on CohortReportFormController.onSubmit

openmrs · Jan 2, 2024 · 6ba8804 · 6ba8804
1 parent 5d36876
commit 6ba8804
Showing 1 changed file with 5 additions and 0 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
@@ -315,6 +315,11 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 		Document xml = db.parse(new InputSource(new StringReader(
 		        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" + data)));
 		Node node = findChild(xml, "reportSchema");
+
+		if(node == null) {
+			return null;
+		}
+
 		node = findChild(node, "dataSets");
 		Element dsd = xml.createElement("dataSetDefinition");
 		dsd.setAttribute("name", "cohorts");