dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6223
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-03-08 15:43:53 +0100
message:
  Debug code
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedOrgUnitDataValueStore.java
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java


--
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/JdbcAggregatedOrgUnitDataValueStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedOrgUnitDataValueStore.java	2012-03-08 14:30:26 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedOrgUnitDataValueStore.java	2012-03-08 14:43:53 +0000
@@ -228,7 +228,7 @@
                 "AND periodid IN ( " + getCommaDelimitedString( periodIds ) + " ) " +
                 "AND organisationunitid = " + organisationUnitId + " " +
                 "AND organisationunitgroupid IN ( " + getCommaDelimitedString( organisationUnitGroupIds ) + " )";
-            System.out.println( sql );
+            
             final ResultSet resultSet = holder.getStatement().executeQuery( sql );
             
             return mapper.getCollection( resultSet, new AggregatedOrgUnitIndicatorValueRowMapper() );

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java	2012-03-02 08:21:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java	2012-03-08 14:43:53 +0000
@@ -64,12 +64,8 @@
     private static final String PORT_SEPARATOR = ":";
     private static final String PROTOCOL = "http://";;
     
-    private static final Map<String, String> CONTENT_TYPE_MAP = new HashMap<String, String>() {
-        /**
-         * Determines if a de-serialized file is compatible with this class.
-         */
-        private static final long serialVersionUID = -8332376695197474041L;
-    {
+    private static final Map<String, String> CONTENT_TYPE_MAP = new HashMap<String, String>() 
+    { {
         put( "pdf", CONTENT_TYPE_PDF );
         put( "zip", CONTENT_TYPE_ZIP );
         put( "json", CONTENT_TYPE_JSON );