Additional fix for #9290

graemerocher · graemerocher · commit 4251ff4faaff · 2016-10-21T11:20:12.000+02:00
diff --git a/grails-validation/src/main/groovy/org/grails/validation/GrailsDomainClassValidator.java b/grails-validation/src/main/groovy/org/grails/validation/GrailsDomainClassValidator.java
@@ -249,7 +249,6 @@ protected void cascadeValidationToOne(Errors errors, BeanWrapper bean, Object as
             errors.setNestedPath(buildNestedPath(nestedPath, propertyName, indexOrKey));
 
             for (GrailsDomainClassProperty associatedPersistentProperty : associatedPersistentProperties) {
-                if (associatedPersistentProperty.equals(otherSide)) continue;
                 if (persistentProperty.isEmbedded() && EMBEDDED_EXCLUDES.contains(associatedPersistentProperty.getName())) {
                     continue;
                 }
@@ -261,6 +260,7 @@ associatedObject, errors, new BeanWrapperImpl(associatedObject),
                             associatedConstraintedProperties);
                 }
 
+                if (associatedPersistentProperty.equals(otherSide)) continue;
                 if (associatedPersistentProperty.isAssociation()) {
                     cascadeToAssociativeProperty(errors, new BeanWrapperImpl(associatedObject),
                             associatedPersistentProperty);

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,6 @@ protected void cascadeValidationToOne(Errors errors, BeanWrapper bean, Object as`
`249`	`249`	`errors.setNestedPath(buildNestedPath(nestedPath, propertyName, indexOrKey));`
`250`	`250`
`251`	`251`	`for (GrailsDomainClassProperty associatedPersistentProperty : associatedPersistentProperties) {`
`252`		`- if (associatedPersistentProperty.equals(otherSide)) continue;`
`253`	`252`	`if (persistentProperty.isEmbedded() && EMBEDDED_EXCLUDES.contains(associatedPersistentProperty.getName())) {`
`254`	`253`	`continue;`
`255`	`254`	`}`
`@@ -261,6 +260,7 @@ associatedObject, errors, new BeanWrapperImpl(associatedObject),`
`261`	`260`	`associatedConstraintedProperties);`
`262`	`261`	`}`
`263`	`262`
	`263`	`+ if (associatedPersistentProperty.equals(otherSide)) continue;`
`264`	`264`	`if (associatedPersistentProperty.isAssociation()) {`
`265`	`265`	`cascadeToAssociativeProperty(errors, new BeanWrapperImpl(associatedObject),`
`266`	`266`	`associatedPersistentProperty);`