This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 75c98d8d817f98fb18a6b43d5a094f8a11f14cb1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jul 19 17:13:31 2014 +0200 fix dao code --- .../pollen/persistence/entity/ChoiceTopiaDao.java | 27 ++++++++++------------ 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/ChoiceTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/ChoiceTopiaDao.java index da3a9e2..c0548ed 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/ChoiceTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/ChoiceTopiaDao.java @@ -21,8 +21,6 @@ package org.chorem.pollen.persistence.entity; * #L% */ -import org.nuiton.topia.persistence.TopiaNoResultException; - import java.util.List; public class ChoiceTopiaDao extends AbstractChoiceTopiaDao<Choice> { @@ -38,22 +36,21 @@ public class ChoiceTopiaDao extends AbstractChoiceTopiaDao<Choice> { @Override public void delete(Choice entity) { - // remove Resource + if (entity.getChoiceType() == ChoiceType.RESOURCE) { - try { - PollenResourceTopiaDao dao = topiaDaoSupplier - .getDao(PollenResource.class, PollenResourceTopiaDao.class); - PollenResource resource = dao - .forEquals(PollenResource.PROPERTY_TOPIA_ID, entity.getChoiceValue()) - .findUnique(); - - dao.delete(resource); - - } catch (TopiaNoResultException e) { - e.printStackTrace(); - } + + // remove Resource + PollenResourceTopiaDao dao = topiaDaoSupplier + .getDao(PollenResource.class, PollenResourceTopiaDao.class); + PollenResource resource = dao + .forEquals(PollenResource.PROPERTY_TOPIA_ID, entity.getChoiceValue()) + .findUnique(); + + dao.delete(resource); + } super.delete(entity); + } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.