branch develop updated (920bef6 -> dfaa79d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 920bef6 On ignore un test qui pose problème new dfaa79d Correction d'une NPE potentielle The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit dfaa79d2563988a46f60e8c72ae61ef6a1ef1cf8 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Jan 14 10:01:11 2015 +0100 Correction d'une NPE potentielle Summary of changes: .../fr/ifremer/wao/services/service/BoatsFilterValues.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
participants (1)
-
codelutin.com scm