=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java 2011-01-07 11:37:47 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java 2011-03-01 06:02:22 +0000 @@ -27,6 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import java.util.ArrayList; import java.util.Collection; import java.util.Map; import java.util.TreeMap; @@ -103,13 +104,13 @@ { String aggregationStrategy = (String) systemSettingManager.getSystemSetting( KEY_AGGREGATION_STRATEGY, DEFAULT_AGGREGATION_STRATEGY ); - Collection dataElements = dataSet.getDataElements(); + Collection dataElements = new ArrayList( dataSet.getDataElements()); FilterUtils.filter( dataElements, new AggregatableDataElementFilter() ); Map map = new TreeMap(); - for ( DataElement dataElement : dataSet.getDataElements() ) + for ( DataElement dataElement : dataElements ) { DataElementCategoryCombo categoryCombo = dataElement.getCategoryCombo();