You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/05/04 14:15:29 UTC

svn commit: r535198 - in /cayenne/main/branches/STABLE-2.0/cayenne: cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContextDeleteAction.java cayenne-other/release-notes/RELEASE-NOTES-2.0-SNAPSHOT.txt

Author: aadamchik
Date: Fri May  4 05:15:29 2007
New Revision: 535198

URL: http://svn.apache.org/viewvc?view=rev&rev=535198
Log:
CAY-784 Deleting an object with a read-only flattened relationship fails

Modified:
    cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContextDeleteAction.java
    cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-SNAPSHOT.txt

Modified: cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContextDeleteAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContextDeleteAction.java?view=diff&rev=535198&r1=535197&r2=535198
==============================================================================
--- cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContextDeleteAction.java (original)
+++ cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContextDeleteAction.java Fri May  4 05:15:29 2007
@@ -127,7 +127,7 @@
             ObjRelationship relationship = (ObjRelationship) it.next();
 
             boolean processFlattened = relationship.isFlattened()
-                    && relationship.isToDependentEntity();
+                    && relationship.isToDependentEntity() && !relationship.isReadOnly();
 
             // first check for no action... bail out if no flattened processing is needed
             if (relationship.getDeleteRule() == DeleteRule.NO_ACTION && !processFlattened) {

Modified: cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-SNAPSHOT.txt
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-SNAPSHOT.txt?view=diff&rev=535198&r1=535197&r2=535198
==============================================================================
--- cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-SNAPSHOT.txt (original)
+++ cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-SNAPSHOT.txt Fri May  4 05:15:29 2007
@@ -28,6 +28,7 @@
 CAY-778 Cayenne jar manifest lists project.version as "cayenne"
 CAY-781 Bug in CayenneDataObject.readNestedProperty
 CAY-783 jgroups config file not removed from cayenne.xml
+CAY-784 Deleting an object with a read-only flattened relationship fails
 
 ----------------------------------
 Release: 2.0.2