This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit dfaa79d2563988a46f60e8c72ae61ef6a1ef1cf8 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Jan 14 10:01:11 2015 +0100 Correction d'une NPE potentielle --- .../fr/ifremer/wao/services/service/BoatsFilterValues.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java index 7cda05d..58d9aac 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java @@ -100,10 +100,12 @@ public class BoatsFilterValues extends AbstractFilterValues { ); } - for (ElligibleBoat elligibleBoat : boat.getElligibleBoat()) { - SampleRow sampleRow = elligibleBoat.getSampleRow(); - if (elligibleBoat.isBoatElligible()) { - elligibleForSampleRowsFilterValues.addSampleRowForBoatFilter(sampleRow); + if (boat.isElligibleBoatNotEmpty()) { + for (ElligibleBoat elligibleBoat : boat.getElligibleBoat()) { + SampleRow sampleRow = elligibleBoat.getSampleRow(); + if (elligibleBoat.isBoatElligible()) { + elligibleForSampleRowsFilterValues.addSampleRowForBoatFilter(sampleRow); + } } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.