Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/BedQualityAccess.java @ 3780:7fa38f8bcd8d
Avoid NPE if the user selects onlyone sort of characteristic diameter.
flys-artifacts/trunk@5487 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Mon, 17 Sep 2012 09:16:20 +0000 |
| parents | 048a02e29808 |
| children | d5d2faf14522 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/BedQualityAccess.java Sun Sep 16 20:45:24 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/BedQualityAccess.java Mon Sep 17 09:16:20 2012 +0000 @@ -47,15 +47,17 @@ } public List<String> getBedDiameter() { - if (bedDiameter == null) { - bedDiameter = extractDiameter(getString("bed_diameter")); + String value = getString("bed_diameter"); + if (bedDiameter == null && value != null) { + bedDiameter = extractDiameter(value); } return bedDiameter; } public List<String> getBedloadDiameter() { - if (bedloadDiameter == null) { - bedloadDiameter = extractDiameter(getString("load_diameter")); + String value = getString("load_diameter"); + if (bedloadDiameter == null && value != null) { + bedloadDiameter = extractDiameter(value); } return bedloadDiameter; }