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 2013/07/20 10:20:07 UTC
svn commit: r1505108 -
/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/NamedObjectFactory.java
Author: aadamchik
Date: Sat Jul 20 08:20:06 2013
New Revision: 1505108
URL: http://svn.apache.org/r1505108
Log:
CAY-1736 IllegalArgumentException when synchronizing entities in the Modeler
somewhat based on Ilya's patch, but the fix itself is limited to NamedObjectFactory.java
(cherry picked from commit daba658f4c67fb0d032fe3f5e5544c0851360596)
Modified:
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/NamedObjectFactory.java
Modified: cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/NamedObjectFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/NamedObjectFactory.java?rev=1505108&r1=1505107&r2=1505108&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/NamedObjectFactory.java (original)
+++ cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/NamedObjectFactory.java Sat Jul 20 08:20:06 2013
@@ -421,7 +421,7 @@ public abstract class NamedObjectFactory
@Override
protected boolean isNameInUse(String name, Object namingContext) {
Entity ent = (Entity) namingContext;
- return ent.getAttribute(name) != null;
+ return ent.getAttribute(name) != null || ent.getRelationship(name) != null;
}
}
@@ -479,7 +479,7 @@ public abstract class NamedObjectFactory
@Override
protected boolean isNameInUse(String name, Object namingContext) {
Entity ent = (Entity) namingContext;
- return ent.getRelationship(name) != null;
+ return ent.getRelationship(name) != null || ent.getAttribute(name) != null;
}
/**