← Back to branch summary

~dhis2-devs-core/+junk/dhis2-xml-ng

« back to all changes in this revision

Viewing changes to dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitHierarchyConverter.java

  • Committer: Bob Jolliffe
  • Date: 2009-12-28 00:10:10 UTC
  • mfrom: (1265.1.24 trunk)
  • Revision ID: bobj@bobj-laptop-20091228001010-74keze4t25s96xi0
Merged in changes from trunk (trying to stay in synch)

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitHierarchyConverter.java
139
139
        Integer parentId = organisationUnitMapping.get( Integer.parseInt( values.get( FIELD_PARENT ) ) );
140
140
        Integer childId = organisationUnitMapping.get( Integer.parseInt( values.get( FIELD_CHILD ) ) );
141
141
        
142
 
        if ( parentId != null && childId != null && parentId.equals( childId ) ) // Parent id equals child id for root
 
142
        if ( parentId != null && childId != null && !parentId.equals( childId ) ) // Parent id equals child id for root
143
143
        {
144
144
            association.setGroupId( parentId );
145
145
            association.setMemberId( childId );