svn commit: r438449 - in /incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi: CjpaEntityManager.java CjpaEntityTransaction.java

[aadamchik]

Author: aadamchik
Date: Wed Aug 30 03:35:59 2006
New Revision: 438449

URL: http://svn.apache.org/viewvc?rev=438449&view=rev
Log:
bug - no EntityManager flushing occured on resource-local transaction flush

Modified:
    
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManager.java
    
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityTransaction.java

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManager.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManager.java?rev=438449&r1=438448&r2=438449&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManager.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManager.java
 Wed Aug 30 03:35:59 2006
@@ -47,7 +47,7 @@
 
     @Override
     protected EntityTransaction createResourceLocalTransaction() {
-        return new 
CjpaEntityTransaction(Transaction.internalTransaction(null));
+        return new 
CjpaEntityTransaction(Transaction.internalTransaction(null), this);
     }
 
     @Override

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityTransaction.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityTransaction.java?rev=438449&r1=438448&r2=438449&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityTransaction.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityTransaction.java
 Wed Aug 30 03:35:59 2006
@@ -20,6 +20,7 @@
 
 import java.sql.SQLException;
 
+import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.PersistenceException;
 
@@ -33,10 +34,12 @@
  */
 public class CjpaEntityTransaction implements EntityTransaction {
 
+    protected EntityManager entityManager;
     protected Transaction transaction;
     protected boolean rollbackOnly;
 
-    public CjpaEntityTransaction(Transaction transaction) {
+    public CjpaEntityTransaction(Transaction transaction, EntityManager 
entityManager) {
+        this.entityManager = entityManager;
         this.transaction = transaction;
     }
 
@@ -65,6 +68,7 @@
         }
 
         try {
+            entityManager.flush();
             transaction.commit();
         }
         catch (SQLException e) {