Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentDensityFactory.java @ 5712:84e02b3f7a4f
Avoid NPE in sediment density factory and return a valid density if no exists.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Mon, 15 Apr 2013 17:04:38 +0200 |
parents | 71e6fe870c1d |
children |
comparison
equal
deleted
inserted
replaced
5711:06f3a36a83b6 | 5712:84e02b3f7a4f |
---|---|
79 .addScalar("year", StandardBasicTypes.INTEGER); | 79 .addScalar("year", StandardBasicTypes.INTEGER); |
80 sqlQuery.setString("name", river); | 80 sqlQuery.setString("name", river); |
81 results = sqlQuery.list(); | 81 results = sqlQuery.list(); |
82 SedimentDensity density = new SedimentDensity(); | 82 SedimentDensity density = new SedimentDensity(); |
83 for (Object[] row : results) { | 83 for (Object[] row : results) { |
84 density.addDensity((Double)row[0], (Double)row[1], (Integer)row[2]); | 84 if (row[0] != null && row[1] != null && row[2] != null) { |
85 density.addDensity((Double)row[0], (Double)row[1], (Integer)row[2]); | |
86 } | |
85 } | 87 } |
86 | 88 |
87 density.cleanUp(); | 89 density.cleanUp(); |
88 return density; | 90 return density; |
89 } | 91 } |