svn commit: r527216 - /incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java

[da...@apache.org]

Author: dain
Date: Tue Apr 10 10:39:56 2007
New Revision: 527216

URL: http://svn.apache.org/viewvc?view=rev&rev=527216
Log:
Always store entities that have been loaded

Modified:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java?view=diff&rev=527216&r1=527215&r2=527216
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java Tue Apr 10 10:39:56 2007
@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
+import java.util.Set;
 import javax.ejb.CreateException;
 import javax.ejb.EJBException;
 import javax.ejb.EJBHome;
@@ -43,6 +44,7 @@
 import javax.ejb.EJBAccessException;
 import javax.transaction.TransactionManager;
 import javax.transaction.TransactionSynchronizationRegistry;
+import javax.transaction.Synchronization;
 
 import org.apache.openejb.ApplicationException;
 import org.apache.openejb.DeploymentInfo;
@@ -100,6 +102,12 @@
      * Tracks entity instances that have been "entered" so we can throw reentrancy exceptions.
      */
     protected EntrancyTracker entrancyTracker;
+    protected TransactionSynchronizationRegistry synchronizationRegistry;
+    private static final Object ENTITIES_TO_STORE = new Object() {
+        public String toString() {
+            return "EntitiesToStore";
+        }
+    };
 
     public CmpContainer(Object id, TransactionManager transactionManager, SecurityService securityService, String cmpEngineFactory, String engine, String connectorName) {
         this.transactionManager = transactionManager;
@@ -108,7 +116,8 @@
         this.cmpEngineFactory = cmpEngineFactory;
         this.connectorName = connectorName;
         this.engine = engine;
-        entrancyTracker = new EntrancyTracker(SystemInstance.get().getComponent(TransactionSynchronizationRegistry.class));
+        synchronizationRegistry = SystemInstance.get().getComponent(TransactionSynchronizationRegistry.class);
+        entrancyTracker = new EntrancyTracker(synchronizationRegistry);
 
         cmpCallback = new ContainerCmpCallback();
     }
@@ -380,6 +389,32 @@
         } finally {
             ThreadContext.exit(oldCallContext);
         }
+
+        // if we call load we must call store
+        try {
+            //noinspection unchecked
+            Set<EntityBean> registeredEntities = (LinkedHashSet<EntityBean>) synchronizationRegistry.getResource(ENTITIES_TO_STORE);
+            if (registeredEntities == null) {
+                registeredEntities = new LinkedHashSet<EntityBean>();
+                synchronizationRegistry.putResource(ENTITIES_TO_STORE, registeredEntities);
+                synchronizationRegistry.registerInterposedSynchronization(new Synchronization() {
+                    public void beforeCompletion() {
+                        //noinspection unchecked
+                        Set<EntityBean> registeredEntities = (LinkedHashSet<EntityBean>) synchronizationRegistry.getResource(ENTITIES_TO_STORE);
+                        if (registeredEntities == null) {
+                            return;
+                        }
+                        for (EntityBean entityBean : registeredEntities) {
+                            ejbStore(entityBean);
+                        }
+                    }
+                    public void afterCompletion(int i) {
+                    }
+                });
+            }
+            registeredEntities.add(entityBean);
+        } catch (Exception e) {
+        }
     }
 
     private void ejbStore(EntityBean entityBean) {
@@ -511,6 +546,7 @@
         return returnValue;
     }
 
+    @SuppressWarnings({"UnusedDeclaration"})
     private boolean isApplicationException(DeploymentInfo deploymentInfo, Throwable e) {
         return e instanceof Exception && !(e instanceof RuntimeException);
     }