Author: blavenier Date: 2013-02-08 21:33:53 +0100 (Fri, 08 Feb 2013) New Revision: 368 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/368 Log: Fix : - importTemporarySpecies must return a filled Species object Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-08 19:59:05 UTC (rev 367) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-08 20:33:53 UTC (rev 368) @@ -55,6 +55,7 @@ import org.hibernate.type.StringType; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; +import org.springframework.dao.DataRetrievalFailureException; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -355,11 +356,15 @@ @Override //TODO manage Cacheable(value = "species") public Species getSpeciesByReferenceTaxonId(Integer speciesId) { - TaxonRefTaxVO source = taxonNameDao.getTaxonNameReferent( + try { + TaxonRefTaxVO source = taxonNameDao.getTaxonNameReferent( speciesId); - - Species target = loadSpecies(source); - return target; + Species target = loadSpecies(source); + return target; + } + catch(DataRetrievalFailureException drfe) { + return null; + } } @Override @@ -487,10 +492,7 @@ taxonName = taxonNameDao.createAsTemporary(taxonName, "Added by tutti (file import)."); // update the source - Species result = new Species(); - result.setName(source.getName()); - result.setId(taxonName.getTaxonNameId().toString()); - result.setReferenceTaxonId(taxonName.getReferenceTaxonId()); + Species result = loadSpecies(taxonName); return result; }