dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2221
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2010-11-29 17:44:34 +0100
message:
  Merged r 2059 from 2.0.5
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataSetImporter.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-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataSetImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataSetImporter.java	2010-05-31 13:53:07 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataSetImporter.java	2010-11-29 16:44:34 +0000
@@ -80,7 +80,14 @@
     @Override
     protected DataSet getMatching( DataSet object )
     {
-        return dataSetService.getDataSetByName( object.getName() );
+        DataSet match = dataSetService.getDataSetByName( object.getName() );
+        
+        if ( match == null )
+        {
+            match = dataSetService.getDataSetByShortName( object.getShortName() );
+        }
+        
+        return match;
     }
 
     @Override