cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
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 GMT
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<DbAttribute>
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);
                 }
             }
         }



Mime
View raw message