dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6977
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-05-17 16:29:39 +0200
message:
  minor importer fix..
modified:
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.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/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2012-05-17 12:05:39 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2012-05-17 14:29:39 +0000
@@ -124,7 +124,7 @@
         // FIXME add uidValidator.. part of bean validation impl?
         // object.setUid( CodeGenerator.generateCode() );
 
-        log.debug( "Trying to save new object => " + getDisplayName( object ) );
+        log.debug( "Trying to save new object => " + getDisplayName( object ) + " (" + object.getClass().getSimpleName() + ")" );
 
         Map<Field, Set<? extends IdentifiableObject>> identifiableObjectCollections =
             scanIdentifiableObjectCollections( object );
@@ -210,8 +210,6 @@
 
         for ( T object : objects )
         {
-            log.info( "Currently importing: " + object + " (" + object.getClass().getSimpleName() + ")" );
-
             List<ImportConflict> conflicts = importObjectLocal( object, options );
 
             if ( !options.isDryRun() )
@@ -461,7 +459,7 @@
             Period period = (Period) identifiableObject;
             period = periodStore.reloadForceAddPeriod( period );
 
-            if(!options.isDryRun())
+            if ( !options.isDryRun() )
             {
                 sessionFactory.getCurrentSession().flush();
             }