Mercurial > dive4elements > river
changeset 8091:8a5466f82b70
merge
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Fri, 15 Aug 2014 18:03:41 +0200 |
| parents | 01f778f84330 (current diff) 7e55790da464 (diff) |
| children | 7d4be7a6a2b1 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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];