r3030 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal - Topia-commits

14 Mar 2014

Author: bleny
Date: 2014-03-14 15:15:54 +0100 (Fri, 14 Mar 2014)
New Revision: 3030

Url: http://forge.nuiton.org/projects/topia/repository/revisions/3030

Log:
fixes #3120 

Modified:
   trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java
   trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaPersistenceContext.java

Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java
===================================================================

--- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java	2014-03-14 13:25:07 UTC (rev 3029)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java	2014-03-14 14:15:54 UTC (rev 3030)
@@ -46,6 +46,7 @@
 import org.nuiton.topia.persistence.TopiaPersistenceContext;
 import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep;
 import org.nuiton.topia.persistence.TopiaQueryBuilderRunQueryStep;
+import org.nuiton.topia.persistence.support.TopiaHibernateSupport;
 import org.nuiton.topia.persistence.support.TopiaJpaSupport;
 import org.nuiton.topia.persistence.support.TopiaListenableSupport;
 import org.nuiton.topia.persistence.support.TopiaSqlSupport;
@@ -92,6 +93,8 @@
 
     protected TopiaJpaSupport topiaJpaSupport;
 
+    protected TopiaHibernateSupport topiaHibernateSupport;
+
     protected TopiaSqlSupport topiaSqlSupport;
 
     protected TopiaListenableSupport topiaListenableSupport;
@@ -112,6 +115,7 @@
      */
     public void init(
             TopiaJpaSupport topiaJpaSupport,
+            TopiaHibernateSupport topiaHibernateSupport,
             TopiaSqlSupport topiaSqlSupport,
             TopiaListenableSupport topiaListenableSupport,
             TopiaIdFactory topiaIdFactory,
@@ -121,6 +125,7 @@
             log.debug("init dao for " + getEntityClass());
         }
         this.topiaJpaSupport = topiaJpaSupport;
+        this.topiaHibernateSupport = topiaHibernateSupport;
         this.topiaSqlSupport = topiaSqlSupport;
         this.topiaListenableSupport = topiaListenableSupport;
         this.topiaIdFactory = topiaIdFactory;

Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaPersistenceContext.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaPersistenceContext.java	2014-03-14 13:25:07 UTC (rev 3029)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaPersistenceContext.java	2014-03-14 14:15:54 UTC (rev 3030)
@@ -34,16 +34,16 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
 import org.hibernate.cfg.Configuration;
+import org.nuiton.topia.persistence.TopiaDao;
+import org.nuiton.topia.persistence.TopiaEntity;
 import org.nuiton.topia.persistence.TopiaException;
+import org.nuiton.topia.persistence.TopiaIdFactory;
 import org.nuiton.topia.persistence.TopiaPersistenceContext;
 import org.nuiton.topia.persistence.TopiaReplicationDestination;
 import org.nuiton.topia.persistence.internal.support.HibernateTopiaJpaSupport;
 import org.nuiton.topia.persistence.internal.support.HibernateTopiaReplicationSupport;
 import org.nuiton.topia.persistence.internal.support.HibernateTopiaSqlSupport;
 import org.nuiton.topia.persistence.internal.support.TopiaFiresSupport;
-import org.nuiton.topia.persistence.TopiaDao;
-import org.nuiton.topia.persistence.TopiaEntity;
-import org.nuiton.topia.persistence.TopiaIdFactory;
 import org.nuiton.topia.persistence.support.TopiaHibernateSupport;
 import org.nuiton.topia.persistence.support.TopiaJpaSupport;
 import org.nuiton.topia.persistence.support.TopiaListenableSupport;
@@ -277,7 +277,7 @@
     }
 
     @Override
-    public <E extends TopiaEntity> void  deleteAll(Iterable<E> entities) {
+    public <E extends TopiaEntity> void deleteAll(Iterable<E> entities) {
         for (E entity : entities) {
             delete(entity);
         }
@@ -330,7 +330,7 @@
 
             if (dao instanceof AbstractTopiaDao) {
                 AbstractTopiaDao abstractTopiaDao = (AbstractTopiaDao) dao;
-                abstractTopiaDao.init(jpaSupport, sqlSupport, listenableSupport, topiaIdFactory, firesSupport, this);
+                abstractTopiaDao.init(jpaSupport, hibernateSupport, sqlSupport, listenableSupport, topiaIdFactory, firesSupport, this);
             }
 
             daoCache.put(entityClass, dao);

    

r3030 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal

bleny＠users.nuiton.org

tags

participants (1)