You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by mg...@apache.org on 2013/06/19 15:49:43 UTC
svn commit: r1494622 -
/cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjAttributeValidator.java
Author: mgentry
Date: Wed Jun 19 13:49:43 2013
New Revision: 1494622
URL: http://svn.apache.org/r1494622
Log:
CAY-1813: Missing ObjEntity Attribute Validation with Duplicate DbEntity Columns. Fixed error with bailing out too early in comparison loop.
Modified:
cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjAttributeValidator.java
Modified: cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjAttributeValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjAttributeValidator.java?rev=1494622&r1=1494621&r2=1494622&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjAttributeValidator.java (original)
+++ cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjAttributeValidator.java Wed Jun 19 13:49:43 2013
@@ -156,7 +156,7 @@ public class ObjAttributeValidator exten
String dbAttributePath = attribute.getDbAttributePath();
if (dbAttributePath != null) {
- if (dbAttributePath.equals(comparisonAttribute.getDbAttributePath()))
+ if (dbAttributePath.equals(comparisonAttribute.getDbAttributePath())) {
validator.registerWarning
("ObjEntity " +
entity.getName() +
@@ -165,7 +165,8 @@ public class ObjAttributeValidator exten
" -> " +
dbAttributePath +
")", path);
- return; // Duplicate found, stop.
+ return; // Duplicate found, stop.
+ }
}
}
}