=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2011-01-06 09:03:29 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2011-01-06 09:53:49 +0000 @@ -30,6 +30,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.regex.Matcher; @@ -545,7 +547,7 @@ else { crossTabPeriods.add( null ); - reportPeriods = new ArrayList( allPeriods ); + reportPeriods = new ArrayList( new HashSet( allPeriods ) ); // Remove potential duplicates from relative periods / params indexColumns.add( PERIOD_ID ); indexNameColumns.add( PERIOD_NAME ); } @@ -559,7 +561,7 @@ else { crossTabUnits.add( null ); - reportUnits = new ArrayList( allUnits ); + reportUnits = new ArrayList( new HashSet( allUnits ) ); // Remove potential duplicates from params indexColumns.add( ORGANISATIONUNIT_ID ); indexNameColumns.add( ORGANISATIONUNIT_NAME ); }