Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 3779:3530e23e5c3e | 3780:7fa38f8bcd8d |
|---|---|
| 45 } | 45 } |
| 46 return ranges; | 46 return ranges; |
| 47 } | 47 } |
| 48 | 48 |
| 49 public List<String> getBedDiameter() { | 49 public List<String> getBedDiameter() { |
| 50 if (bedDiameter == null) { | 50 String value = getString("bed_diameter"); |
| 51 bedDiameter = extractDiameter(getString("bed_diameter")); | 51 if (bedDiameter == null && value != null) { |
| 52 bedDiameter = extractDiameter(value); | |
| 52 } | 53 } |
| 53 return bedDiameter; | 54 return bedDiameter; |
| 54 } | 55 } |
| 55 | 56 |
| 56 public List<String> getBedloadDiameter() { | 57 public List<String> getBedloadDiameter() { |
| 57 if (bedloadDiameter == null) { | 58 String value = getString("load_diameter"); |
| 58 bedloadDiameter = extractDiameter(getString("load_diameter")); | 59 if (bedloadDiameter == null && value != null) { |
| 60 bedloadDiameter = extractDiameter(value); | |
| 59 } | 61 } |
| 60 return bedloadDiameter; | 62 return bedloadDiameter; |
| 61 } | 63 } |
| 62 | 64 |
| 63 private List<DateRange> extractRanges(String dateString) { | 65 private List<DateRange> extractRanges(String dateString) { |