Author: tchemit Date: 2014-02-11 18:47:47 +0100 (Tue, 11 Feb 2014) New Revision: 1587 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1587 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-11 14:03:33 UTC (rev 1586) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-02-11 17:47:47 UTC (rev 1587) @@ -515,7 +515,7 @@ Float frequenciesWeigth = persistenceService.countFrequenciesWeight(frequencies, true); - if (TuttiEntities.isEqualWeight(weight, frequenciesWeigth)) { + if (frequenciesWeigth != null && TuttiEntities.isEqualWeight(weight, frequenciesWeigth)) { result = t("tutti.service.operations.cleanWeights.error.redundant.frequencyWeight", weightUnit.fromEntity(weight), weightUnit.getShortLabel(), @@ -536,7 +536,7 @@ // on a leaf, check if weight is not = to the finest category weight Float weight = batch.getWeight(); Float sampleCategoryWeight = batch.getSampleCategoryWeight(); - if (weight != null && TuttiEntities.isEqualWeight(weight, sampleCategoryWeight)) { + if (weight != null && sampleCategoryWeight != null && TuttiEntities.isEqualWeight(weight, sampleCategoryWeight)) { result = t("tutti.service.operations.cleanWeights.error.redundant.weight", weightUnit.fromEntity(weight),