[isis] branch master updated: ISIS-1974: relaxes validation a tiny bit

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new db3408c  ISIS-1974: relaxes validation a tiny bit
db3408c is described below

commit db3408cfe3cd6219a89a8986b71bac83429fa2df
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Oct 12 09:42:58 2018 +0100

    ISIS-1974: relaxes validation a tiny bit
---
 .../facets/object/recreatable/RecreatableObjectFacetFactory.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
index 99f491c..a66cdc5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
@@ -109,7 +109,7 @@ public class RecreatableObjectFacetFactory extends FacetFactoryAbstract
             public boolean visit(final ObjectSpecification objectSpec, final ValidationFailures validationFailures) {
                 final ViewModelFacet facet = objectSpec.getFacet(ViewModelFacet.class);
                 final Facet underlyingFacet = facet != null ? facet.getUnderlyingFacet() : null;
-                if(underlyingFacet != null) {
+                if(underlyingFacet != null && underlyingFacet.getClass() != facet.getClass()) {
                     validationFailures.add(
                             "%s: has multiple incompatible annotations/interfaces indicating that " +
                                     "it is a recreatable object of some sort (%s and %s)",