[Dive4elements-commits] [PATCH 2 of 2] Fix typos and NPEs

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1371737458 -7200
# Node ID fa8425c8694cc20fcc75cf16a36d01e946279262
# Parent  8d6f23243d1dc39571959c5983375dd66cb3259b
Fix typos and NPEs.

diff -r 8d6f23243d1d -r fa8425c8694c artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadCalculation.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadCalculation.java	Thu Jun 20 11:42:47 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadCalculation.java	Thu Jun 20 16:10:58 2013 +0200
@@ -300,7 +300,7 @@
                 addProblem(km, "missing.data.coarse");
                 continue;
             }
-            if (fraction.getFine_middle() <= 0d && load.hasFineMiddle()) {
+            if (fraction.getFineMiddle() <= 0d && load.hasFineMiddle()) {
                 addProblem(km, "missing.data.fine_middle");
                 continue;
             }
diff -r 8d6f23243d1d -r fa8425c8694c artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java	Thu Jun 20 11:42:47 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java	Thu Jun 20 16:10:58 2013 +0200
@@ -388,13 +388,16 @@
             Object[] row = results.get(i);
             double km = (Double)row[3];
             MeasurementStation station = stations.get(km);
-            MeasurementStation nextStation = stations.ceilingEntry(km + 0.1d).getValue();
+            MeasurementStation nextStation = null;
+            if (stations.ceilingEntry(km + 0.1d) != null) {
+                nextStation = stations.ceilingEntry(km + 0.1d).getValue();
+            }
             Range range = null;
             if (station == null) {
                 log.warn("No measurement station for " + fraction + " km " + km);
             }
             else {
-                if (nextRange != null)
+                if (nextStation != null)
                     range = new Range(station.getRange().getA().doubleValue(),
                         nextStation.getRange().getA().doubleValue());
                 else {