Author: bleny Date: 2014-07-02 14:05:47 +0200 (Wed, 02 Jul 2014) New Revision: 2119 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2119 Log: fixes #5367 prevent NPE Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java 2014-06-30 14:55:52 UTC (rev 2118) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java 2014-07-02 12:05:47 UTC (rev 2119) @@ -67,7 +67,7 @@ @Override public void validate() { - if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + if (filter.getPeriodFrom() != null && filter.getPeriodTo() != null && filter.getPeriodTo().before(filter.getPeriodFrom())) { addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-06-30 14:55:52 UTC (rev 2118) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-07-02 12:05:47 UTC (rev 2119) @@ -119,7 +119,7 @@ @Override public void validate() { - if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + if (filter.getPeriodFrom() != null && filter.getPeriodTo() != null && filter.getPeriodTo().before(filter.getPeriodFrom())) { addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-06-30 14:55:52 UTC (rev 2118) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-07-02 12:05:47 UTC (rev 2119) @@ -60,7 +60,7 @@ @Override public void validate() { - if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + if (filter.getPeriodFrom() != null && filter.getPeriodTo() != null && filter.getPeriodTo().before(filter.getPeriodFrom())) { addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); }