dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10561
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-04-15 18:34:57 +0200
message:
  Upgraded Spring to version 3.2.2 and Hibernate to version 4.2.0.Final.
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/orgunitdistribution/impl/DefaultOrgUnitDistributionService.java
  dhis-2/pom.xml


--
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-reporting/src/main/java/org/hisp/dhis/orgunitdistribution/impl/DefaultOrgUnitDistributionService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/orgunitdistribution/impl/DefaultOrgUnitDistributionService.java	2012-11-06 16:50:13 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/orgunitdistribution/impl/DefaultOrgUnitDistributionService.java	2013-04-15 16:34:57 +0000
@@ -50,7 +50,6 @@
 import org.jfree.chart.axis.CategoryLabelPositions;
 import org.jfree.chart.plot.PlotOrientation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
 
 /**
  * @author Lars Helge Overland
@@ -90,7 +89,10 @@
         
         Grid grid = getOrganisationUnitDistribution( groupSet, organisationUnit, true );
         
-        Assert.isTrue( grid != null && grid.getHeight() == 1 );
+        if ( grid == null || grid.getHeight() != 1 )
+        {
+            return null;
+        }
         
         for ( int i = 1; i < grid.getWidth() - 2; i++ ) // Skip name, none and total column
         {

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2013-03-22 13:47:40 +0000
+++ dhis-2/pom.xml	2013-04-15 16:34:57 +0000
@@ -917,9 +917,9 @@
   <properties>
     <rootDir></rootDir>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring.version>3.2.1.RELEASE</spring.version>
+    <spring.version>3.2.2.RELEASE</spring.version>
     <spring.security.version>3.1.3.RELEASE</spring.security.version>
-    <hibernate.version>4.1.8.Final</hibernate.version>
+    <hibernate.version>4.2.0.Final</hibernate.version>
     <hibernate-validator.version>4.3.1.Final</hibernate-validator.version>
     <jackson.version>2.0.6</jackson.version>
     <camel.version>2.10.2</camel.version>