TRUNK-3567 Add Observation without Question Concept throws NullPointerException

apien · wluyima · commit 93403054f208 · 2013-05-03T16:00:27.000-04:00
diff --git a/web/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java b/web/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java
@@ -106,8 +106,7 @@ protected void onBind(HttpServletRequest request, Object command) throws Excepti
 			obs.setValueCoded(obs.getValueCodedName().getConcept());
 		}
 		
-		// Set the complex obs value before we validate. See TRUNK-3353
-		if (obs.getConcept().isComplex()) {
+        if ( obs.getConcept() != null && obs.getConcept().isComplex()) {
 			InputStream complexDataInputStream = setComplexData(obs, request);
 			if (complexDataInputStream != null) {
 				complexDataInputStream.close();

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,7 @@ protected void onBind(HttpServletRequest request, Object command) throws Excepti`
`106`	`106`	`obs.setValueCoded(obs.getValueCodedName().getConcept());`
`107`	`107`	`}`
`108`	`108`
`109`		`- // Set the complex obs value before we validate. See TRUNK-3353`
`110`		`- if (obs.getConcept().isComplex()) {`
	`109`	`+ if ( obs.getConcept() != null && obs.getConcept().isComplex()) {`
`111`	`110`	`InputStream complexDataInputStream = setComplexData(obs, request);`
`112`	`111`	`if (complexDataInputStream != null) {`
`113`	`112`	`complexDataInputStream.close();`