=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/AbstractImporter.java' --- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/AbstractImporter.java 2012-04-05 11:56:10 +0000 +++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/AbstractImporter.java 2012-04-05 14:15:06 +0000 @@ -112,14 +112,15 @@ @Override public List importCollection( List objects, ImportOptions options ) { - if ( !objects.isEmpty() ) - { - T object = objects.get( 0 ); - reset( object ); - } - List conflicts = new ArrayList(); + if ( objects.isEmpty() ) + { + return conflicts; + } + + reset( objects.get( 0 ) ); + for ( T object : objects ) { ImportConflict importConflict = importObjectLocal( object, options ); @@ -136,7 +137,7 @@ @Override public ImportConflict importObject( T object, ImportOptions options ) { - if ( object != null ) + if ( object == null ) { reset( object ); } @@ -165,7 +166,7 @@ imports = 0; updates = 0; ignores = 0; - + uidMap = manager.getIdMap( (Class) type.getClass(), IdentifiableObject.IdentifiableProperty.UID ); nameMap = manager.getIdMap( (Class) type.getClass(), IdentifiableObject.IdentifiableProperty.NAME ); codeMap = manager.getIdMap( (Class) type.getClass(), IdentifiableObject.IdentifiableProperty.CODE );