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 2010/10/04 19:16:29 UTC
svn commit: r1004327 - in /cayenne/main/branches/STABLE-3.0:
docs/doc/src/main/resources/RELEASE-NOTES.txt
framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java
Author: aadamchik
Date: Mon Oct 4 17:16:28 2010
New Revision: 1004327
URL: http://svn.apache.org/viewvc?rev=1004327&view=rev
Log:
CAY-1488 OutOfMemory when selecting "Remove Foreign Keys Mapped as Object Attributes"
* patch by Andrey Veprev
Modified:
cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt
cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1004327&r1=1004326&r2=1004327&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt Mon Oct 4 17:16:28 2010
@@ -12,7 +12,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/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java?rev=1004327&r1=1004326&r2=1004327&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java (original)
+++ cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java Mon Oct 4 17:16:28 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);
}
}
}