ISIS-993: add the ObjectLayoutMetadata#actions collection if null
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/78f9d8e0 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/78f9d8e0 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/78f9d8e0 Branch: refs/heads/ISIS-993 Commit: 78f9d8e06b539c36ebea4f8c10db7d4e08e9e42b Parents: 1be513a Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Sat Jan 9 07:46:49 2016 +0000 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Mon Jan 25 15:06:07 2016 +0000 ---------------------------------------------------------------------- .../services/layout/ObjectLayoutMetadataServiceDefault.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/78f9d8e0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/ObjectLayoutMetadataServiceDefault.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/ObjectLayoutMetadataServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/ObjectLayoutMetadataServiceDefault.java index e2a2e1d..3080769 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/ObjectLayoutMetadataServiceDefault.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/ObjectLayoutMetadataServiceDefault.java @@ -272,7 +272,12 @@ public class ObjectLayoutMetadataServiceDefault if(!missingActionIds.isEmpty()) { for (String actionId : missingActionIds) { - metadata.getActions().add(new ActionLayoutMetadata(actionId)); + List<ActionLayoutMetadata> actions = metadata.getActions(); + if(actions == null) { + actions = Lists.newArrayList(); + metadata.setActions(actions); + } + actions.add(new ActionLayoutMetadata(actionId)); } } }
