Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 29462 invoked from network); 4 May 2007 12:18:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 May 2007 12:18:32 -0000 Received: (qmail 22025 invoked by uid 500); 4 May 2007 12:18:39 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 22001 invoked by uid 500); 4 May 2007 12:18:39 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 21992 invoked by uid 99); 4 May 2007 12:18:39 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2007 05:18:39 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2007 05:18:32 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 2D6231A9838; Fri, 4 May 2007 05:18:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Fri, 04 May 2007 12:18:12 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070504121812.2D6231A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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) {