[seam-commits] Seam SVN: r7729 - branches/Seam_2_0/src/main/org/jboss/seam/framework.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-03-28 07:11:49 -0400 (Fri, 28 Mar 2008)
New Revision: 7729

Modified:
   branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityController.java
   branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityHome.java
   branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityQuery.java
   branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityController.java
   branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityHome.java
   branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityQuery.java
   branches/Seam_2_0/src/main/org/jboss/seam/framework/MutableEntityController.java
   branches/Seam_2_0/src/main/org/jboss/seam/framework/PersistenceController.java
Log:
backport r7719, JBSEAM-2780

Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityController.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityController.java	2008-03-28 10:32:17 UTC (rev 7728)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityController.java	2008-03-28 11:11:49 UTC (rev 7729)
@@ -82,4 +82,10 @@
       getEntityManager().remove(entity);
    }
    
+   @Override
+   protected boolean isPersistenceContextOpen(EntityManager persistenceContext)
+   {
+      return persistenceContext.isOpen();
+   }
+   
 }

Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityHome.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityHome.java	2008-03-28 10:32:17 UTC (rev 7728)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityHome.java	2008-03-28 11:11:49 UTC (rev 7729)
@@ -216,4 +216,10 @@
       }
    }
    
+   @Override
+   protected boolean isPersistenceContextOpen(EntityManager persistenceContext)
+   {
+      return persistenceContext.isOpen();
+   }
+   
 }

Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityQuery.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityQuery.java	2008-03-28 10:32:17 UTC (rev 7728)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityQuery.java	2008-03-28 11:11:49 UTC (rev 7729)
@@ -235,4 +235,10 @@
       }
    }
 
+   @Override
+   protected boolean isPersistenceContextOpen(EntityManager persistenceContext)
+   {
+      return persistenceContext.isOpen();
+   }
+   
 }

Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityController.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityController.java	2008-03-28 10:32:17 UTC (rev 7728)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityController.java	2008-03-28 11:11:49 UTC (rev 7729)
@@ -118,4 +118,10 @@
       getSession().refresh(entity);
    }
 
+   @Override
+   protected boolean isPersistenceContextOpen(Session persistenceContext)
+   {
+      return persistenceContext.isOpen();
+   }
+   
 }

Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityHome.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityHome.java	2008-03-28 10:32:17 UTC (rev 7728)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityHome.java	2008-03-28 11:11:49 UTC (rev 7729)
@@ -119,4 +119,10 @@
       }
    }
    
+   @Override
+   protected boolean isPersistenceContextOpen(Session persistenceContext)
+   {
+      return persistenceContext.isOpen();
+   }
+   
 }

Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityQuery.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityQuery.java	2008-03-28 10:32:17 UTC (rev 7728)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityQuery.java	2008-03-28 11:11:49 UTC (rev 7729)
@@ -201,5 +201,11 @@
    {
       this.fetchSize = fetchSize;
    }
+   
+   @Override
+   protected boolean isPersistenceContextOpen(Session persistenceContext)
+   {
+      return persistenceContext.isOpen();
+   }
 
 }

Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/MutableEntityController.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/MutableEntityController.java	2008-03-28 10:32:17 UTC (rev 7728)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/MutableEntityController.java	2008-03-28 11:11:49 UTC (rev 7729)
@@ -82,4 +82,10 @@
       getEntityManager().remove(entity);
    }
    
+   @Override
+   protected boolean isPersistenceContextOpen(EntityManager persistenceContext)
+   {
+      return persistenceContext.isOpen();
+   }
+   
 }

Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/PersistenceController.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/PersistenceController.java	2008-03-28 10:32:17 UTC (rev 7728)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/PersistenceController.java	2008-03-28 11:11:49 UTC (rev 7729)
@@ -15,7 +15,7 @@
    
    public T getPersistenceContext()
    {
-      if (persistenceContext==null)
+      if (persistenceContext==null || !isPersistenceContextOpen(persistenceContext))
       {
          persistenceContext = (T) getComponentInstance( getPersistenceContextName() );
       }
@@ -28,5 +28,10 @@
    }
 
    protected abstract String getPersistenceContextName();
+   
+   protected boolean isPersistenceContextOpen(T persistenceContext)
+   {
+      return false;
+   }
 
 }