=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java	2013-03-14 03:45:19 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java	2013-03-14 04:06:49 +0000
@@ -255,11 +255,7 @@
 
         Map<String, OrganisationUnit> orgUnitMap = new HashMap<String, OrganisationUnit>();
 
-        if ( !orgUnitIdScheme.equals( IdentifiableProperty.UUID ) )
-        {
-            identifiableObjectManager.getIdMap( OrganisationUnit.class, orgUnitIdScheme );
-        }
-        else
+        if ( orgUnitIdScheme == IdentifiableProperty.UUID )
         {
             Collection<OrganisationUnit> allOrganisationUnits = organisationUnitService.getAllOrganisationUnits();
 
@@ -268,6 +264,10 @@
                 orgUnitMap.put( organisationUnit.getUuid(), organisationUnit );
             }
         }
+        else
+        {
+            orgUnitMap = identifiableObjectManager.getIdMap( OrganisationUnit.class, orgUnitIdScheme );
+        }
 
         Map<String, DataElementCategoryOptionCombo> categoryOptionComboMap = identifiableObjectManager.getIdMap( DataElementCategoryOptionCombo.class, IdentifiableProperty.UID );
         Map<String, Period> periodMap = new HashMap<String, Period>();