=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java 2015-01-19 09:19:46 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java 2015-01-23 16:35:50 +0000 @@ -257,6 +257,7 @@ { for ( PeriodType periodType : periodStore.getAllPeriodTypes() ) { + periodType = periodStore.reloadPeriodType( periodType ); periodTypes.add( periodType ); periodTypeMap.put( periodType.getName(), periodType ); } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2015-01-19 09:19:46 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2015-01-23 16:35:50 +0000 @@ -337,9 +337,9 @@ log.debug( "Trying to save new object => " + ImportUtils.getDisplayName( object ) + " (" + object.getClass().getSimpleName() + ")" + "" ); + updatePeriodTypes( object ); objectBridge.saveObject( object, !options.isSharing() ); - updatePeriodTypes( object ); reattachCollectionFields( object, collectionFields, user ); objectBridge.updateObject( object );