dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3332
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-04-10 12:59:28 +0200
message:
  Upgraded to quick 1.3.2, improves exception resource management
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.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-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java	2011-03-15 23:26:14 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java	2011-04-10 10:59:28 +0000
@@ -311,7 +311,7 @@
             try
             {
                 final String sql = "CREATE INDEX aggregateddatavalue_index ON aggregateddatavalue (dataelementid, categoryoptioncomboid, periodid, organisationunitid)";        
-                statementManager.getHolder().executeUpdate( sql );
+                statementManager.getHolder().executeUpdate( sql, true );
             }
             catch ( Exception ex )
             {
@@ -324,7 +324,7 @@
             try
             {
                 final String sql = "CREATE INDEX aggregatedindicatorvalue_index ON aggregatedindicatorvalue (indicatorid, periodid, organisationunitid)";        
-                statementManager.getHolder().executeUpdate( sql );
+                statementManager.getHolder().executeUpdate( sql, true );
             }
             catch ( Exception ex )
             {
@@ -340,7 +340,7 @@
             try
             {
                 final String sql = "DROP INDEX aggregateddatavalue_index";
-                statementManager.getHolder().executeUpdate( sql );
+                statementManager.getHolder().executeUpdate( sql, true );
             }
             catch ( Exception ex )
             {
@@ -353,7 +353,7 @@
             try
             {
                 final String sql = "DROP INDEX aggregatedindicatorvalue_index";
-                statementManager.getHolder().executeUpdate( sql );
+                statementManager.getHolder().executeUpdate( sql, true );
             }
             catch ( Exception ex )
             {

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2011-04-09 18:17:19 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2011-04-10 10:59:28 +0000
@@ -545,7 +545,6 @@
                 int columnIndex = 0;
 
                 if ( chart.isDimension( DIMENSION_PERIOD ) || chart.isDimension( DIMENSION_INDICATOR ) )
-
                 {
                     // ---------------------------------------------------------
                     // Regular dataset

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java	2011-03-01 23:29:00 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java	2011-04-10 10:59:28 +0000
@@ -212,7 +212,7 @@
         try
         {
             final String sql = "CREATE INDEX aggregateddatasetcompleteness_index ON aggregateddatasetcompleteness (datasetid, periodid, organisationunitid)";        
-            statementManager.getHolder().executeUpdate( sql );
+            statementManager.getHolder().executeUpdate( sql, true );
         }
         catch ( Exception ex )
         {
@@ -225,7 +225,7 @@
         try
         {
             final String sql = "DROP INDEX aggregateddatasetcompleteness_index";        
-            statementManager.getHolder().executeUpdate( sql );
+            statementManager.getHolder().executeUpdate( sql, true );
         }
         catch ( Exception ex )
         {

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2011-04-01 07:26:15 +0000
+++ dhis-2/pom.xml	2011-04-10 10:59:28 +0000
@@ -379,7 +379,7 @@
       <dependency>
         <groupId>org.amplecode</groupId>
         <artifactId>quick</artifactId>
-        <version>1.3</version>
+        <version>1.3.2</version>
       </dependency>
       <dependency>
         <groupId>com.lowagie</groupId>