=== 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-12-09 07:25:53 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-12-16 10:10:23 +0000
@@ -856,10 +856,11 @@
{
if ( !dryRun && !internalValue.isNullValue() )
{
- batchHandler.addObject( internalValue );
+ if ( batchHandler.addObject( internalValue ) )
+ {
+ importCount++;
+ }
}
-
- importCount++;
}
}
}
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/batchhandler/MockBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/batchhandler/MockBatchHandler.java 2014-10-13 17:59:47 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/batchhandler/MockBatchHandler.java 2014-12-16 10:10:23 +0000
@@ -65,9 +65,9 @@
}
@Override
- public void addObject( T object )
+ public boolean addObject( T object )
{
- inserts.add( object );
+ return inserts.add( object );
}
@Override
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2014-12-16 09:11:08 +0000
+++ dhis-2/pom.xml 2014-12-16 10:10:23 +0000
@@ -552,7 +552,7 @@
org.amplecode
quick
- 1.10
+ 1.11
org.amplecode