Author: bleny Date: 2011-05-23 16:43:46 +0000 (Mon, 23 May 2011) New Revision: 1292 Log: getObservationType deal with NPE Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-05-23 16:28:33 UTC (rev 1291) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-05-23 16:43:46 UTC (rev 1292) @@ -476,7 +476,11 @@ @Override public ObservationType getObservationType() { - return ObservationType.valueOf(getObservationTypeOrdinal()); + ObservationType observationType = null; + if (getObservationTypeOrdinal() != null) { + observationType = ObservationType.valueOf(getObservationTypeOrdinal()); + } + return observationType; } @Override