Author: bleny Date: 2014-04-02 11:24:15 +0200 (Wed, 02 Apr 2014) New Revision: 1799 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1799 Log: fix NPE Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-04-02 09:16:05 UTC (rev 1798) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-04-02 09:24:15 UTC (rev 1799) @@ -193,7 +193,7 @@ SampleRowsFilter that = (SampleRowsFilter) o; - boolean equals = obsProgram.equals(that.obsProgram) + boolean equals = Objects.equals(obsProgram, that.obsProgram) && Objects.equals(periodFrom, that.periodFrom) && Objects.equals(periodTo, that.periodTo) && WaoUtils.isEqualCollection(sampleRowIds, that.sampleRowIds) @@ -214,7 +214,7 @@ @Override public int hashCode() { - int hashCode = obsProgram.hashCode(); + int hashCode = Objects.hashCode(obsProgram); hashCode = 31 * hashCode + WaoUtils.collectionHashcode(sampleRowIds); hashCode = 31 * hashCode + WaoUtils.collectionHashcode(fishingZoneFacadeNames); hashCode = 31 * hashCode + WaoUtils.collectionHashcode(fishingZoneSectorNames); Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-04-02 09:16:05 UTC (rev 1798) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-04-02 09:24:15 UTC (rev 1799) @@ -46,9 +46,9 @@ wao.import.failure.wrongUser=There is no user with login '%s' wao.import.sampleRow.failure.fishingZoneMissing=You must precise at least one fishing zone wao.import.sampleRow.failure.missingSampleRowCode=You must precise a code for the sample row +wao.import.sampleRow.failure.unknownFishingGearDcfCode=Unknown fishing gear code\: %s +wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode=Unknown target species code\: %s wao.import.sampleRow.failure.wrongFishingZone=There is no fishing zone with the code '%s' wao.import.sampleRow.failure.wrongSampleRowCodeFormat=The sample row code '%s' is not compliant with the format "YYYY_PIIII" -wao.import.sampleRow.failure.unknownFishingGearDcfCode=Unknown fishing gear code\: %s -wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode=Unknown target species code\: %s wao.validation.sampleRow.conflictOnObserver=Observer %s cannot be associated to the line %s because he has to observer, on the same day, for row %s wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s Modified: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-04-02 09:16:05 UTC (rev 1798) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-04-02 09:24:15 UTC (rev 1799) @@ -46,9 +46,9 @@ wao.import.failure.wrongUser=Il n'y a pas d'utilisateur ayant pour identifiant '%s' wao.import.sampleRow.failure.fishingZoneMissing=Il faut préciser au moins une zone de pêche wao.import.sampleRow.failure.missingSampleRowCode=Il faut préciser un code pour a ligne du plan +wao.import.sampleRow.failure.unknownFishingGearDcfCode=Le code engin %s est inconnu du référentiel +wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode=Le code espèce cible %s est inconnu du référentiel wao.import.sampleRow.failure.wrongFishingZone=Le code '%s' ne correspond à aucune zone de pêche connue du référentiel wao.import.sampleRow.failure.wrongSampleRowCodeFormat=Le code '%s' n'est pas un code de ligne valide selon le format "AAAA_PIIII" -wao.import.sampleRow.failure.unknownFishingGearDcfCode=Le code engin %s est inconnu du référentiel -wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode=Le code espèce cible %s est inconnu du référentiel wao.validation.sampleRow.conflictOnObserver=L'observateur %s ne peut être associé à la ligne %s car il doit observer, le même jour, pour la ligne %s wao.validation.sampleRow.observerNotInCompany=L'observateur %s ne fait pas parti de la société %s