dhis2-devs team mailing list archive

[Edward Ari Bichetero <ebichete@xxxxxxxxx>]

Edward Ari Bichetero has proposed merging lp:~ebichete/dhis2/dhis2 into lp:dhis2.

Requested reviews:
  DHIS 2 core developers (dhis2-devs-core)

For more details, see:
https://code.launchpad.net/~ebichete/dhis2/dhis2/+merge/182887

The aggregation code was checking the wrong collection of OrganisationUnit ids was empty. In most cases, defined by your DHIS2 setup, the bug was benign. However, when it hit, it would cause major aggregation errors.
-- 
https://code.launchpad.net/~ebichete/dhis2/dhis2/+merge/182887
Your team DHIS 2 developers is subscribed to branch lp:dhis2.

=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java	2013-08-29 12:25:48 +0000
@@ -503,7 +503,7 @@
                 // Aggregation
                 // ---------------------------------------------------------------------
 
-                if ( _orgunitIds.size() > 0 )
+                if ( !orgunitIds.isEmpty() )
                 {
                     insertAggregateValue( caseExpression, caseOperator, dataelementId, optionComboId, deSumId,
                         orgunitIds, period );