Author: kmorin Date: 2013-05-28 10:19:56 +0200 (Tue, 28 May 2013) New Revision: 1020 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1020 Log: fix NPE Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-05-28 08:11:28 UTC (rev 1019) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-05-28 08:19:56 UTC (rev 1020) @@ -586,7 +586,7 @@ if (categoryWeight == null && rowWeight != null) { // throw new TuttiBusinessException(_("tutti.service.operations.computeWeights.error.incoherentRowWeightCategory")); - } else if (!rowWeight.equals(frequencyWeight)) { + } else if (rowWeight != null && !rowWeight.equals(frequencyWeight)) { throw new TuttiWeightComputingException( _("tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightFrequency", species, batch.getSampleCategoryType().getLabel(), categoryValue,