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:12:10 UTC
svn commit: r535197 - in /cayenne/main/branches/STABLE-1.2/cayenne:
cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/DataContextDeleteAction.java
cayenne-other/release-notes/RELEASE-NOTES-1.2.3.txt
Author: aadamchik
Date: Fri May 4 05:12:09 2007
New Revision: 535197
URL: http://svn.apache.org/viewvc?view=rev&rev=535197
Log:
CAY-784 Deleting an object with a read-only flattened relationship fails
Modified:
cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/DataContextDeleteAction.java
cayenne/main/branches/STABLE-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.3.txt
Modified: cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/DataContextDeleteAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/DataContextDeleteAction.java?view=diff&rev=535197&r1=535196&r2=535197
==============================================================================
--- cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/DataContextDeleteAction.java (original)
+++ cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/DataContextDeleteAction.java Fri May 4 05:12:09 2007
@@ -163,7 +163,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-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.3.txt
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.3.txt?view=diff&rev=535197&r1=535196&r2=535197
==============================================================================
--- cayenne/main/branches/STABLE-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.3.txt (original)
+++ cayenne/main/branches/STABLE-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.3.txt Fri May 4 05:12:09 2007
@@ -23,3 +23,4 @@
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