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 2021/06/28 18:43:47 UTC
[isis] 04/04: ISIS-2483: adds a guard for bootstrap grid menu
loading
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2779
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c14d3d5f3fbc2d43b62cdd473f55a3a565ad4646
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jun 28 19:43:11 2021 +0100
ISIS-2483: adds a guard for bootstrap grid menu loading
---
.../services/grid/bootstrap3/GridSystemServiceBootstrap.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java
index 0640888..a276139 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java
@@ -354,8 +354,12 @@ public class GridSystemServiceBootstrap extends GridSystemServiceAbstract<BS3Gri
if(layoutGroupFacet.isExplicitBinding()) {
final PropertyLayoutData propertyLayoutData = propertyLayoutDataById.get(layoutGroupName);
- final ActionLayoutData actionLayoutData = new ActionLayoutData(actionId);
- final ActionPositionFacet actionPositionFacet = objectAction.getFacet(ActionPositionFacet.class);
+ if(propertyLayoutData == null) {
+ log.warn(String.format("Could not find propertyLayoutData for layoutGroupName of '%s'", layoutGroupName));
+ continue;
+ }
+ val actionLayoutData = new ActionLayoutData(actionId);
+ val actionPositionFacet = objectAction.getFacet(ActionPositionFacet.class);
final ActionLayoutDataOwner owner;
final ActionLayout.Position position;
if(actionPositionFacet != null) {