svn commit: r707569 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src: main/java/org/apache/cayenne/ObjectContextStateLog.java test/java/org/apache/cayenne/remote/CayenneContextDeletionTest.java

[andrey]

Author: andrey
Date: Fri Oct 24 00:13:36 2008
New Revision: 707569

URL: http://svn.apache.org/viewvc?rev=707569&view=rev
Log:
CAY-1129 ROP: CayenneContext does not unregister deleted nodes
fix & test

Added:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionTest.java
Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContextStateLog.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContextStateLog.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContextStateLog.java?rev=707569&r1=707568&r2=707569&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContextStateLog.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContextStateLog.java
 Fri Oct 24 00:13:36 2008
@@ -23,7 +23,9 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
+import java.util.Vector;
 
 import org.apache.cayenne.graph.GraphChangeHandler;
 import org.apache.cayenne.graph.GraphManager;
@@ -52,6 +54,11 @@
      * Updates dirty objects state and clears dirty ids map.
      */
     void graphCommitted() {
+        /**
+         * Array for deleted ids, to avoid concurrent modification
+         */
+        List deletedIds = new Vector();
+        
         for (Object id : dirtyIds) {
             Object node = graphManager.getNode(id);
             if (node instanceof Persistent) {
@@ -62,11 +69,19 @@
                         
persistentNode.setPersistenceState(PersistenceState.COMMITTED);
                         break;
                     case PersistenceState.DELETED:
+                        deletedIds.add(id);
                         
persistentNode.setPersistenceState(PersistenceState.TRANSIENT);
                         break;
                 }
             }
         }
+        
+        /**
+         * Now unregister all deleted objects
+         */
+        for (Object id : deletedIds) {
+            graphManager.unregisterNode(id);
+        }
 
         clear();
     }

Added: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionTest.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionTest.java?rev=707569&view=auto
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionTest.java
 (added)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionTest.java
 Fri Oct 24 00:13:36 2008
@@ -0,0 +1,34 @@
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ ****************************************************************/
+package org.apache.cayenne.remote;
+
+import org.apache.cayenne.testdo.mt.ClientMtTable1;
+
+public class CayenneContextDeletionTest extends RemoteCayenneCase {
+    public void testDeletion() {
+        ClientMtTable1 obj = context.newObject(ClientMtTable1.class);
+        context.commitChanges();
+        
+        context.deleteObject(obj);
+        
+        //now check that the object is unregistered
+        context.commitChanges();
+        assertNull(context.getGraphManager().getNode(obj.getObjectId()));
+    }
+}