[isis] branch master updated: ISIS-2270: do not introspect vetoed types

[ah...@apache.org]

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

ahuber 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 3119afc  ISIS-2270: do not introspect vetoed types
3119afc is described below

commit 3119afc2a6c3e9adffafb7e8bfe0c80904aafd60
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 21 23:16:47 2020 +0100

    ISIS-2270: do not introspect vetoed types
---
 .../core/metamodel/specloader/SpecificationLoaderDefault.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
index 6ff6be8..e698ffb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
@@ -232,11 +232,12 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
             val sort = entry.getValue(); 
 
             val spec = loadSpecification(type, IntrospectionState.NOT_INTROSPECTED);
-            if(spec!=null) {
-                knownSpecs.add(spec);
-            } else {
+            if(spec==null) {
                 typeRegistry.veto(type);
-            }
+                return;
+            } 
+            
+            knownSpecs.add(spec);
 
             if(sort.isManagedBean() || sort.isEntity() || sort.isViewModel() || sort.isMixin()) {
                 domainObjectSpecs.add(spec);