You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/04/19 12:26:53 UTC

[2/2] isis git commit: ISIS-1602: prevent NPE for mixins which are missing the NonContributedFacet

ISIS-1602: prevent NPE for mixins which are missing the NonContributedFacet


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e843c0ad
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e843c0ad
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e843c0ad

Branch: refs/heads/master
Commit: e843c0ad0ced78df948253d74fed744d0bcefd85
Parents: ed62ace
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Apr 19 14:24:33 2017 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Apr 19 14:24:33 2017 +0200

----------------------------------------------------------------------
 .../metamodel/specloader/specimpl/ObjectSpecificationAbstract.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/e843c0ad/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index ddc0ffb..792521b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -1166,7 +1166,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
             }
             final ObjectActionDefault mixinAction = (ObjectActionDefault) mixinTypeAction;
             final NotContributedFacet notContributedFacet = mixinAction.getFacet(NotContributedFacet.class);
-            if(notContributedFacet.toActions()) {
+            if(notContributedFacet != null && notContributedFacet.toActions()) {
                 continue;
             }