# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1304061745 0
# Node ID 3571357c85a7ddbfc35c80f6567f1aa7d1a3591f
# Parent  e5ea6a01526ca1f79923733c762fca774406856d
Bugfix: Removed endless loop and a bug while iterating over Hibernate results.

flys-artifacts/trunk@1768 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r e5ea6a01526c -r 3571357c85a7 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Thu Apr 28 12:54:11 2011 +0000
+++ b/flys-artifacts/ChangeLog	Fri Apr 29 07:22:25 2011 +0000
@@ -1,3 +1,9 @@
+2011-04-29  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java:
+	  Bugfix: Removed endless loop and a bug while iterating over Hibernate
+	  results.
+
 2011-04-28  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java:
diff -r e5ea6a01526c -r 3571357c85a7 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java	Thu Apr 28 12:54:11 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java	Fri Apr 29 07:22:25 2011 +0000
@@ -160,7 +160,7 @@
         public double interpolateW(double q) {
             if (Double.isNaN(q)) return Double.NaN;
             int index = getQIndex(q);
-            return index >= 0 ? ws[index] : interpolateW(-index -1);
+            return index >= 0 ? ws[index] : interpolateW(-index -1, q);
         }
 
         public int getQIndex(double q) {
@@ -462,8 +462,9 @@
         Double lastQ     = -Double.MAX_VALUE;
         boolean qSorted  = true;
 
-        for (Iterator<Object []> iter = sqlQuery.iterate(); iter.hasNext();) {
-            Object [] result = iter.next();
+        for (Object  r: sqlQuery.list()) {
+            Object[] result = (Object[]) r;
+
             double km    = (Double) result[0];
             Double w     = (Double) result[1];
             Double q     = (Double) result[2];