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/11/13 23:04:19 UTC

[isis] 01/02: ISIS-1766: adds an null guard for applications that don't yet have any menu.layout.xml - just use the fallback in these cases.

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

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 1e78cad339ba2de2e11f437a6b43a4fefa95519f
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Nov 13 22:58:46 2017 +0000

    ISIS-1766: adds an null guard for applications that don't yet have any menu.layout.xml - just use the fallback in these cases.
---
 .../core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
index cae713f..92392c2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -100,6 +100,9 @@ public class MenuBarsServiceBS3 implements MenuBarsService {
         if(menuBars == null || menuBarsLoaderService.supportsReloading()) {
 
             BS3MenuBars menuBars = menuBarsLoaderService.menuBars();
+            if(menuBars == null) {
+                menuBars = fallbackMenuBars;
+            }
 
             menuBars.setTnsAndSchemaLocation(tnsAndSchemaLocation());
 

-- 
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.