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:18:12 UTC

svn commit: r535199 - in /cayenne/main/trunk: docs/doc/src/main/resources/RELEASE-NOTES.txt framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java

Author: aadamchik
Date: Fri May  4 05:18:11 2007
New Revision: 535199

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

Modified:
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java

Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?view=diff&rev=535199&r1=535198&r2=535199
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Fri May  4 05:18:11 2007
@@ -93,6 +93,7 @@
 CAY-765 Programmatically overriding "use share cache" fails
 CAY-775 AutoAdapter fails to detect Sybase when running with jTDS driver
 CAY-783 jgroups config file not removed from cayenne.xml
+CAY-784 Deleting an object with a read-only flattened relationship fails
 
 API Changes
 ----------------------------------

Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java?view=diff&rev=535199&r1=535198&r2=535199
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java Fri May  4 05:18:11 2007
@@ -125,7 +125,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) {