=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/StoreIterator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/StoreIterator.java	2011-01-08 01:23:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/StoreIterator.java	2011-01-08 01:30:38 +0000
@@ -28,16 +28,16 @@
  */
 
 /**
- * @interface AggregatedDataValueStoreIterator
- * Provides an object for processing a collection of Aggregateddatavalues, such
- *  as from a jdbc resultset
+ * @interface StoreIterator
+ * Provides an object for processing a collection of Objects, such
+ *  as from a jdbc resultset with a rowmapper
  *
  * @author bobj
  */
 public interface StoreIterator<T> {
 
     // ----------------------------------------------------------------------
-    // AggregatedDataValueStoreIterator
+    // StoreIterator
     // ----------------------------------------------------------------------
 
     /**

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcStoreIterator.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcStoreIterator.java	2011-01-08 01:23:07 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcStoreIterator.java	2011-01-08 01:30:38 +0000
@@ -83,7 +83,7 @@
                 this.close();
             }
         } catch (SQLException ex) {
-            log.warn("Error reading aggregateddatavalue row: " + ex);
+            log.warn("Error reading row: " + ex);
         }
         return row;
     }