You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2005/05/15 20:58:35 UTC

svn commit: r170252 - in /incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state: AutoPersistentNewFlushed.java PersistentDirtyFlushed.java PersistentNewFlushed.java

Author: mbo
Date: Sun May 15 11:58:34 2005
New Revision: 170252

URL: http://svn.apache.org/viewcvs?rev=170252&view=rev
Log:
Some flushed lifecycle states missed to register the StateManger at the transactional cache on transitionWriteField or transitionDeletePersistent

Modified:
    incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/AutoPersistentNewFlushed.java
    incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/PersistentDirtyFlushed.java
    incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/PersistentNewFlushed.java

Modified: incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/AutoPersistentNewFlushed.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/AutoPersistentNewFlushed.java?rev=170252&r1=170251&r2=170252&view=diff
==============================================================================
--- incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/AutoPersistentNewFlushed.java (original)
+++ incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/AutoPersistentNewFlushed.java Sun May 15 11:58:34 2005
@@ -57,6 +57,7 @@
     * @see LifeCycleState#transitionDeletePersistent(StateManagerImpl sm)
     */
     protected LifeCycleState transitionDeletePersistent(StateManagerImpl sm) {
+        sm.registerTransactional();
         sm.preDelete();
         return changeState(P_NEW_FLUSHED_DELETED);
     }
@@ -67,6 +68,7 @@
     */
     protected LifeCycleState transitionWriteField(StateManagerImpl sm, 
         Transaction tx) { 
+        sm.registerTransactional();
         return changeState(AP_NEW_FLUSHED_DIRTY); 
     }
 

Modified: incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/PersistentDirtyFlushed.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/PersistentDirtyFlushed.java?rev=170252&r1=170251&r2=170252&view=diff
==============================================================================
--- incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/PersistentDirtyFlushed.java (original)
+++ incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/PersistentDirtyFlushed.java Sun May 15 11:58:34 2005
@@ -43,11 +43,21 @@
     }
 
    /**
+    * @see LifeCycleState#transitionDeletePersistent(StateManagerImpl sm)
+    */
+    protected LifeCycleState transitionDeletePersistent(StateManagerImpl sm) {
+        sm.registerTransactional();
+        sm.preDelete();
+        return changeState(P_DELETED);
+    }
+    
+   /**
     * @see LifeCycleState#transitionWriteField(StateManagerImpl sm,
     *    Transaction tx) 
     */
     protected LifeCycleState transitionWriteField(StateManagerImpl sm,
         Transaction tx) {
+        sm.registerTransactional();
         return changeState(P_DIRTY);
     }
 

Modified: incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/PersistentNewFlushed.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/PersistentNewFlushed.java?rev=170252&r1=170251&r2=170252&view=diff
==============================================================================
--- incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/PersistentNewFlushed.java (original)
+++ incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/state/PersistentNewFlushed.java Sun May 15 11:58:34 2005
@@ -47,6 +47,7 @@
     * @see LifeCycleState#transitionDeletePersistent(StateManagerImpl sm)
     */
     protected LifeCycleState transitionDeletePersistent(StateManagerImpl sm) {
+        sm.registerTransactional();
         sm.preDelete();
         return changeState(P_NEW_FLUSHED_DELETED);
     }
@@ -57,6 +58,7 @@
     */
     protected LifeCycleState transitionWriteField(StateManagerImpl sm,
         Transaction tx) { 
+        sm.registerTransactional();
         return changeState(P_NEW_FLUSHED_DIRTY); 
     }