=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueController.java 2016-02-10 16:39:06 +0000 @@ -267,7 +267,15 @@ fileResourceService.deleteFileResource( dataValue.getValue() ); } - dataValue.setValue( StringUtils.trimToNull( value ) ); + // ----------------------------------------------------------------- + // Value and comment are sent individually, so null checks must be + // made for each. Empty string is sent for clearing a value. + // ----------------------------------------------------------------- + + if ( value != null ) + { + dataValue.setValue( StringUtils.trimToNull( value ) ); + } if ( comment != null ) {