Merge pull request #125 from apache/ISIS-1985-mm-validation

ISIS-1985: fixes mm validation
apache · Sep 13, 2018 · d6160a7 · d6160a7
2 parents 4ed6db4 + 2fbcbf7
commit d6160a7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...do/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java b/...do/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
@@ -129,7 +129,7 @@ private void validate(ObjectSpecification objectSpec, ValidationFailures validat
 
                     // skip checks if annotated with JDO @NotPersistent
                     if(association.containsDoOpFacet(JdoNotPersistentFacet.class)) {
-                        return;
+                        continue;
                     }
 
                     validateBigDecimalValueFacet(association, validationFailures);

diff --git a/...tstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java b/...tstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
@@ -144,7 +144,7 @@ private void validate(ObjectSpecification objectSpec, ValidationFailures validat
 
                     // skip checks if annotated with JDO @NotPersistent
                     if(association.containsDoOpFacet(JdoNotPersistentFacet.class)) {
-                        return;
+                        continue;
                     }
 
                     validateMandatoryFacet(association, validationFailures);

diff --git a/...jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java b/...jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
@@ -112,7 +112,7 @@ private void validate(ObjectSpecification objectSpec, ValidationFailures validat
 
                     // skip checks if annotated with JDO @NotPersistent
                     if(association.containsDoOpFacet(JdoNotPersistentFacet.class)) {
-                        return;
+                        continue;
                     }
 
                     MaxLengthFacet facet = association.getFacet(MaxLengthFacet.class);

diff --git a/...ain/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java b/...ain/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
@@ -103,7 +103,7 @@ public void enlistCreated(final ObjectAdapter adapter) {
             }
             if(enlistedObjectProperties.containsKey(aap)) {
                 // already enlisted, so ignore
-                return;
+                continue;
             }
             PreAndPostValues papv = PreAndPostValues.pre(IsisTransaction.Placeholder.NEW);
             enlistedObjectProperties.put(aap, papv);
@@ -174,7 +174,7 @@ public void enlistDeleting(final ObjectAdapter adapter) {
             }
             if(enlistedObjectProperties.containsKey(aap)) {
                 // already enlisted, so ignore
-                return;
+                continue;
             }
             PreAndPostValues papv = PreAndPostValues.pre(aap.getPropertyValue());
             enlistedObjectProperties.put(aap, papv);