Author: bleny Date: 2010-11-12 15:13:54 +0000 (Fri, 12 Nov 2010) New Revision: 766 Log: fix NPE when selecting nothing in the filter Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-12 14:24:58 UTC (rev 765) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-12 15:13:54 UTC (rev 766) @@ -255,9 +255,14 @@ private Zone sampleRowZone; public void onChangeFromSelectedSampleRow(String sampleRowCode) { - selectedSampleRow = getSampleRowSelectModel().findObject(sampleRowCode); - - logger.debug("selectedSampleRow " + selectedSampleRow.getCode()); + if (sampleRowCode == null) { + selectedSampleRow = null; + } else { + selectedSampleRow = getSampleRowSelectModel().findObject(sampleRowCode); + if (logger.isDebugEnabled()) { + logger.debug("selectedSampleRow " + selectedSampleRow.getCode()); + } + } } public Object onActionFromAddSampleRowCode() {