DHIS

Merge lp:~ebichete/dhis2/dhis2 into lp:dhis2

  1. dhis2
  2. Merge into trunk
Proposed by Edward Ari Bichetero
Status: Needs review
Proposed branch: lp:~ebichete/dhis2/dhis2
Merge into: lp:dhis2
Diff against target: 12 lines (+1/-1)
1 file modified
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java (+1/-1)
To merge this branch: bzr merge lp:~ebichete/dhis2/dhis2
Reviewer Review Type Date Requested Status
DHIS 2 core developers Pending
Review via email: mp+182887@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

Unmerged revisions

11832. By Edward Ari Bichetero

Minor aggregation fix

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java'
2--- dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java 2013-08-23 16:05:01 +0000
3+++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java 2013-08-29 12:25:48 +0000
4@@ -503,7 +503,7 @@
5 // Aggregation
6 // ---------------------------------------------------------------------
7
8- if ( _orgunitIds.size() > 0 )
9+ if ( !orgunitIds.isEmpty() )
10 {
11 insertAggregateValue( caseExpression, caseOperator, dataelementId, optionComboId, deSumId,
12 orgunitIds, period );