Author: bleny Date: 2011-03-14 13:48:04 +0000 (Mon, 14 Mar 2011) New Revision: 1061 Log: refuse obsdeb sampling plan import for lines not associated with a terrestrial location Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-12 14:20:10 UTC (rev 1060) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-14 13:48:04 UTC (rev 1061) @@ -1290,9 +1290,12 @@ ServiceReferential serviceReferential = context.getServiceFactory().getServiceReferential(); if (StringUtils.isBlank(districtCode)) { String districtName = ImportHelper.read(reader, SAMPLING.PLAN_LIEU_NOM); - if (districtName != null && districtName.equals("Autre")) { + if ("Autre".equals(districtName)) { + // line is associated with a place out of france (with no districtCode) TerrestrialLocation district = serviceReferential.getTerrestrialDistrict(null); sampleRow.setTerrestrialLocation(district); + } else { + throw new WaoBusinessException("La ligne " + sampleRow.getCode() + " doit être associée à un lieu terrestre"); } } else { TerrestrialLocation district = serviceReferential.getTerrestrialDistrict(districtCode);