Author: bleny Date: 2011-06-01 13:16:32 +0000 (Wed, 01 Jun 2011) New Revision: 1309 Log: fix NPE Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-06-01 09:00:02 UTC (rev 1308) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-06-01 13:16:32 UTC (rev 1309) @@ -173,24 +173,23 @@ if (contact != null) { contact.getMainObserver(); contact.sizeSecondaryObservers(); - contact.getSampleRow().sizeSampleMonth(); + SampleRow sampleRow = contact.getSampleRow(); + sampleRow.sizeSampleMonth(); contact.getBoat().getName(); if (contact.getObsProgram() == ObsProgram.OBSVENTE) { // load - contact.getSampleRow().getTerrestrialLocation(); + sampleRow.getTerrestrialLocation(); contact.getTerrestrialLocation(); } if (contact.getObsProgram() == ObsProgram.OBSDEB) { // load - TerrestrialDivision observationUnit = - contact.getSampleRow().getObservationUnit(); - if (observationUnit != null) { - observationUnit.getRegionIfremer().getRegionIfremerCode(); + if (sampleRow.isPhoneCall()) { + sampleRow.getTerrestrialLocation(); + } else if (sampleRow.isFieldWorkObservation()) { + sampleRow.getObservationUnit().getRegionIfremer(); } - contact.getSampleRow().getTerrestrialLocation().getRegionIfremerCode(); - contact.getTerrestrialLocation(); } }