Author: tchemit Date: 2014-02-07 16:57:24 +0100 (Fri, 07 Feb 2014) New Revision: 1580 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1580 Log: fix NPE Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-02-07 15:55:06 UTC (rev 1579) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-02-07 15:57:24 UTC (rev 1580) @@ -483,7 +483,8 @@ Float sampleCategoryWeight = batch.getSampleCategoryWeight(); Float parentSampleCategoryWeight = parentBatch.getSampleCategoryWeight(); - if (sampleCategoryWeight != null && TuttiEntities.isEqualWeight(parentSampleCategoryWeight, sampleCategoryWeight)) { + if (sampleCategoryWeight != null && parentSampleCategoryWeight != null && + TuttiEntities.isEqualWeight(parentSampleCategoryWeight, sampleCategoryWeight)) { result = t("tutti.service.operations.cleanWeights.error.redundant.sampleCategoryWeight", weightUnit.fromEntity(sampleCategoryWeight),