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 bcefef2f09ea46350a636a0478e5bb5ba355161f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 10:16:39 2016 +0200 Fix NPE if no set defined on activity --- .../service/actions/consolidate/ConsolidateDataServiceTopia.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java index 4a361cb..753f9c1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java @@ -284,6 +284,13 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements } SetSeine setSeine = activity.getSetSeine(); + + if (setSeine == null) { + if (log.isInfoEnabled()) { + log.info("No set found for activity: " + activity.getTopiaId()); + } + return; + } SchoolTypePersist oldSchoolType = setSeine.getSchoolType(); SchoolTypePersist newSchoolType = activity.getSchoolType(); if (oldSchoolType == null || oldSchoolType != newSchoolType) { @@ -598,7 +605,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements } if (meanWeight == null && totalCount != null && totalCount != 0 && catchWeight != null && - !NonTargetCatchComputedValueSourcePersist.fromSample.equals(nonTargetCatch.getTotalCountComputedSource())) { + !NonTargetCatchComputedValueSourcePersist.fromSample.equals(nonTargetCatch.getTotalCountComputedSource())) { // calcul le poids moyen à partir de nb estime et du poids estime // uniquement si le nombre estimé ne vient pas des échantillons (voir http://forge.codelutin.com/issues/4670) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.