=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java 2014-07-22 16:44:27 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java 2014-09-24 14:52:15 +0000 @@ -169,12 +169,18 @@ return getCategoryOptionCombo(); } + /** + * Indicates whether the value is a zero. + */ public boolean isZero() { return dataElement != null && dataElement.getType().equals( DataElement.VALUE_TYPE_INT ) && value != null && ZERO_PATTERN.matcher( value ).find(); } + /** + * Indicates whether the value is null. + */ public boolean isNullValue() { return value == null && comment == null; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-09-24 14:40:12 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-09-24 14:52:15 +0000 @@ -696,7 +696,7 @@ { if ( strategy.isCreateAndUpdate() || strategy.isCreate() ) { - if ( !dryRun ) + if ( !dryRun && !internalValue.isNullValue() ) { batchHandler.addObject( internalValue ); }