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 2015/10/15 10:49:10 UTC
isis git commit: ISIS-1213: guard against there being no mixin types
if appManifest not in use
Repository: isis
Updated Branches:
refs/heads/master 8cecd6886 -> 99c53f934
ISIS-1213: guard against there being no mixin types if appManifest not in use
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/99c53f93
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/99c53f93
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/99c53f93
Branch: refs/heads/master
Commit: 99c53f934f88fcb68cc31571af7fa99d86a2242d
Parents: 8cecd68
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Oct 15 09:47:39 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Oct 15 09:47:39 2015 +0100
----------------------------------------------------------------------
.../isis/core/metamodel/specloader/ObjectReflectorDefault.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/99c53f93/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
index 4bb6a47..e4abde8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
@@ -261,7 +261,11 @@ public final class ObjectReflectorDefault
}
private void loadSpecificationsForMixins() {
- for (final Class<?> mixinType : AppManifest.Registry.instance().getMixinTypes()) {
+ final Set<Class<?>> mixinTypes = AppManifest.Registry.instance().getMixinTypes();
+ if(mixinTypes == null) {
+ return;
+ }
+ for (final Class<?> mixinType : mixinTypes) {
internalLoadSpecification(mixinType);
}
}