=== 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-16 04:15:14 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2015-01-16 04:39:08 +0000 @@ -437,7 +437,17 @@ reattachFields( object, fields, user ); - persistedObject.mergeWith( object ); + if ( !options.isSharing() ) + { + User persistedObjectUser = persistedObject.getUser(); + persistedObject.mergeWith( object ); + persistedObject.setUser( persistedObjectUser ); + } + else + { + persistedObject.mergeWith( object ); + persistedObject.mergeSharingWith( object ); + } updatePeriodTypes( persistedObject );