diff artifacts/src/main/java/org/dive4elements/river/artifacts/services/SedimentLoadInfoService.java @ 8239:b207eeb66edd

(issue1448) Objectify sq_time_interval id.
author Andre Heinecke <andre.heinecke@intevation.de>
date Mon, 08 Sep 2014 19:47:01 +0200
parents 0bf888783683
children f8ea1a7ecde6
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/SedimentLoadInfoService.java	Mon Sep 08 19:01:26 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/SedimentLoadInfoService.java	Mon Sep 08 19:47:01 2014 +0200
@@ -92,13 +92,13 @@
 
             for (Iterator<Load> it = loads.iterator(); it.hasNext();) {
                 /* Skip loads without time interval for this info type. */
-                if (it.next().getSQRelationTimeIntervalId() == 0) {
+                if (it.next().getSQRelationTimeIntervalId() == null) {
                     it.remove();
                 }
             }
         } else {
             if (!sq_ti_id.isEmpty()) {
-                int id = Integer.parseInt(sq_ti_id);
+                Integer id = Integer.parseInt(sq_ti_id);
                 log.debug("Finding only items for id");
                 loads = allLoadData.findLoads(fromD, toD, id);
             } else {
@@ -135,7 +135,7 @@
                     String.valueOf(calendar.get(Calendar.YEAR)));
             }
             /* SQ Time interval */
-            if (load.getSQRelationTimeIntervalId() != 0) {
+            if (load.getSQRelationTimeIntervalId() != null) {
                 ele.setAttribute("sq_ti_id", String.valueOf(load.getSQRelationTimeIntervalId()));
                 Date start = load.getSQStartTime();
                 Date stop = load.getSQStopTime();

http://dive4elements.wald.intevation.org