This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 0ba9286a57c80197a67ca6244ac07b67705a36bf Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 2 17:37:03 2016 +0200 fix NPE if no trip found for a program --- .../fr/ird/observe/ui/storage/tabs/DataSelectionModel.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java index c4bc8e5..95aecc8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java @@ -300,14 +300,16 @@ public class DataSelectionModel implements Serializable { if (ProgramDto.class.isAssignableFrom(referenceDto.getType())) { List<DataReference> trips = datas.get(referenceDto); - result = !CollectionUtils.isEmpty(trips); + result = CollectionUtils.isNotEmpty(trips); - for (DataReference trip : trips) { - if (!getSelectedData().contains(trip)) { + if (result) { + for (DataReference trip : trips) { + if (!getSelectedData().contains(trip)) { - // au moins une marée non sélectionnée + // au moins une marée non sélectionnée - result = false; + result = false; + } } } } else { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.