dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6487
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-04-05 12:12:35 +0200
message:
  minor changes
modified:
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/AbstractImporter.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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-04 17:50:32 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/AbstractImporter.java	2012-04-05 10:12:35 +0000
@@ -130,7 +130,7 @@
 
         for ( T object : objects )
         {
-            ImportConflict importConflict = importObject( object, options );
+            ImportConflict importConflict = importObjectLocal( object, options );
 
             if ( importConflict != null )
             {
@@ -144,6 +144,16 @@
     @Override
     public ImportConflict importObject( T object, ImportOptions options )
     {
+        if(object != null)
+        {
+            reset( object );
+        }
+
+        return importObjectLocal( object, options );
+    }
+
+    private ImportConflict importObjectLocal( T object, ImportOptions options )
+    {
         ImportConflict conflict = validateIdentifiableObject( object, options );
 
         if ( conflict == null )