Author: tchemit Date: 2012-10-30 15:43:55 +0100 (Tue, 30 Oct 2012) New Revision: 771 Url: http://forge.codelutin.com/repositories/revision/echobase/771 Log: refs #1659: V?\195?\169rifier que les ?\195?\169chantillons hors-vrac sont tous import?\195?\169s (suppression d'un test inutile) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java 2012-10-30 14:34:36 UTC (rev 770) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java 2012-10-30 14:43:55 UTC (rev 771) @@ -241,20 +241,14 @@ sizeCategory.getName())); } - if (sample == null) { - // must create it + // must create it - sample = row.getSample(); - sample.setSpeciesCategory(category); - sample.setSampleType(sampleType); + sample = row.getSample(); + sample.setSpeciesCategory(category); + sample.setSampleType(sampleType); + sample = addSample(sampleDAO, operation, sample, importResult); - sample = addSample(sampleDAO, - operation, - sample, - importResult); - } - // create datas if (row.getMeanLength() != null) {