Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java @ 6544:b24dc0320b75
issue1386: Prevent null-ranges to be set when station of sediment measurement
does not match a measurement station.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Mon, 08 Jul 2013 11:41:10 +0200 |
parents | d1502b8dd091 |
children | a4f60641e445 |
comparison
equal
deleted
inserted
replaced
6543:1ca0688dddc7 | 6544:b24dc0320b75 |
---|---|
434 nextStation = stations.ceilingEntry(km + 0.1d).getValue(); | 434 nextStation = stations.ceilingEntry(km + 0.1d).getValue(); |
435 } | 435 } |
436 Range range = null; | 436 Range range = null; |
437 if (station == null) { | 437 if (station == null) { |
438 log.warn("No measurement station for " + fraction + " km " + km); | 438 log.warn("No measurement station for " + fraction + " km " + km); |
439 continue; | |
439 } | 440 } |
440 else { | 441 else { |
441 if (nextStation != null) | 442 if (nextStation != null) |
442 range = new Range(station.getRange().getA().doubleValue(), | 443 range = new Range(station.getRange().getA().doubleValue(), |
443 nextStation.getRange().getA().doubleValue()); | 444 nextStation.getRange().getA().doubleValue()); |