This is an automated email from the git hooks/post-receive script. New commit to branch feature/8153 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 39cffa5c7d6c047ffb34aa66a341362dc52ecaac Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 31 18:03:51 2016 +0200 Do not import empty SamplingCode --- .../tutti/service/catches/multipost/MultiPostImportService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java index 1a0b6e1..79f3c97 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java @@ -1363,7 +1363,9 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult batch.setLengthStepCaracteristic(row.getLengthStepCaracteristic()); batch.setComment(row.getComment()); batch.setCopyIndividualObservationMode(row.getCopyIndividualObservationMode()); - batch.setSamplingCode(row.getSamplingCode()); + if (StringUtils.isNotEmpty(row.getSamplingCode())) { + batch.setSamplingCode(row.getSamplingCode()); + } batch.setCaracteristics(new CaracteristicMap()); batches.put(row.getBatchId(), batch); @@ -1502,7 +1504,9 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult batch.setLengthStepCaracteristic(row.getLengthStepCaracteristic()); batch.setComment(row.getComment()); batch.setCaracteristics(new CaracteristicMap()); - batch.setSamplingCode(row.getSamplingCode()); + if (StringUtils.isNotEmpty(row.getSamplingCode())) { + batch.setSamplingCode(row.getSamplingCode()); + } batch.setCopyIndividualObservationMode(row.getCopyIndividualObservationMode()); batches.put(row.getBatchId(), batch); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.