This is an automated email from the git hooks/post-receive script. New commit to branch feature/4062 in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 4985b2dfc9bce5ff43f284b05105791c65906fa8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 23 11:16:37 2016 +0200 Fix dao detection --- .../internal/AbstractTopiaPersistenceContext.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaPersistenceContext.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaPersistenceContext.java index fb944dd..3ee00a4 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaPersistenceContext.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaPersistenceContext.java @@ -49,6 +49,7 @@ import org.nuiton.topia.persistence.support.TopiaHibernateSupport; import org.nuiton.topia.persistence.support.TopiaJpaSupport; import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import javax.persistence.metamodel.EntityType; import java.lang.reflect.InvocationTargetException; import java.util.List; import java.util.Map; @@ -281,21 +282,21 @@ public abstract class AbstractTopiaPersistenceContext implements TopiaPersistenc boolean found = false; try { - hibernateFactory.getMetamodel().entity(entityClass); - found = true; + EntityType<E> entity = hibernateFactory.getMetamodel().entity(entityClass); + found = entity != null; } catch (Exception e) { } if (!found) { try { - hibernateFactory.getMetamodel().entity(entityClass.getName() + "Impl"); - found = true; + EntityType<Object> entity = hibernateFactory.getMetamodel().entity(entityClass.getName() + "Impl"); + found = entity != null; } catch (Exception e) { } } if (!found) { try { - hibernateFactory.getMetamodel().entity(entityClass.getName() + "Abstract"); - found = true; + EntityType<Object> entity = hibernateFactory.getMetamodel().entity(entityClass.getName() + "Abstract"); + found = entity != null; } catch (Exception e) { } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.