TRUNK-3567 Add Observation without Question Concept throws NullPointe…

…rException TRUNK-3567 Add Observation without Question Concept throws NullPointerException
openmrs · May 3, 2013 · 9340305 · 9340305
1 parent 35cea87
commit 9340305
Showing 1 changed file with 1 addition and 2 deletions.
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();