[PATCH 2 of 9] merge

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1408118621 -7200
# Node ID 8a5466f82b70b26c7aa7a0f1cdc75020149c21a4
# Parent  01f778f843305d4c12265a7ea0539f201498fa2a
# Parent  7e55790da464499528c217a54fa1568ba55b69f2
merge

diff -r 01f778f84330 -r 8a5466f82b70 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java	Fri Aug 15 14:28:26 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java	Fri Aug 15 18:03:41 2014 +0200
@@ -9,7 +9,7 @@
 
 import java.sql.Timestamp;
 import java.util.HashMap;
-import java.util.Iterator;
+import java.util.List;
 
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.Element;
@@ -120,8 +120,9 @@
         HashMap<Integer, SedimentLoadData.Station> id2station
             = new HashMap<Integer, SedimentLoadData.Station>();
 
-        for (Iterator iter = sqlQuery.iterate(); iter.hasNext();) {
-            Object [] row = (Object [])iter.next();
+        List<Object[]> list = sqlQuery.list();
+
+        for (Object [] row: list) {
 
             Integer   sl_id            = (Integer)row[0];
             Integer   sl_kind          = (Integer)row[1];