Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 24888 invoked from network); 4 Oct 2010 17:29:48 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Oct 2010 17:29:48 -0000 Received: (qmail 17636 invoked by uid 500); 4 Oct 2010 17:29:48 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 17606 invoked by uid 500); 4 Oct 2010 17:29:48 -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 17599 invoked by uid 99); 4 Oct 2010 17:29:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Oct 2010 17:29:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Oct 2010 17:29:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 69B3723889E3; Mon, 4 Oct 2010 17:29:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1004329 - in /cayenne/main/trunk: docs/doc/src/main/resources/RELEASE-NOTES.txt modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java Date: Mon, 04 Oct 2010 17:29:27 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101004172927.69B3723889E3@eris.apache.org> Author: aadamchik Date: Mon Oct 4 17:29:27 2010 New Revision: 1004329 URL: http://svn.apache.org/viewvc?rev=1004329&view=rev Log: CAY-1488 OutOfMemory when selecting "Remove Foreign Keys Mapped as Object Attributes" * patch by Andrey Veprev Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.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?rev=1004329&r1=1004328&r2=1004329&view=diff ============================================================================== --- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original) +++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Mon Oct 4 17:29:27 2010 @@ -65,7 +65,10 @@ Release: 3.0.2 Date: ---------------------------------- +Bug Fixes Since 3.0.1: + CAY-1485 Memory information for about dialog +CAY-1488 OutOfMemory when selecting "Remove Foreign Keys Mapped as Object Attributes" ---------------------------------- Release: 3.0.1 Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java?rev=1004329&r1=1004328&r2=1004329&view=diff ============================================================================== --- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java (original) +++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java Mon Oct 4 17:29:27 2010 @@ -85,7 +85,7 @@ public class DbEntitySyncUndoableEdit ex public MeaningfulFKsUndoableEdit(ObjEntity entity, Collection dbAttrs) { for (DbAttribute da : dbAttrs) { ObjAttribute oa = entity.getAttributeForDbAttribute(da); - while (oa != null) { + if (oa != null) { addEdit(new RemoveAttributeUndoableEdit( domain, map, @@ -93,7 +93,6 @@ public class DbEntitySyncUndoableEdit ex new ObjAttribute[] { oa })); - oa = entity.getAttributeForDbAttribute(da); } } }