npe fix

Evolveum · Apr 9, 2024 · 493cdf6 · 493cdf6
1 parent 5f75eef
commit 493cdf6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuItem.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuItem.java
@@ -61,13 +61,13 @@ public boolean isInsertDefaultBackBreadcrumb() {
     }
 
     public void addMenuItem(MenuItem menuItem) {
-        if (SecurityUtils.isMenuAuthorized(menuItem)) {
+        if (menuItem != null && SecurityUtils.isMenuAuthorized(menuItem)) {
             getItems().add(menuItem);
         }
     }
 
     public void addMenuItemAtIndex(MenuItem menuItem, int position) {
-        if (SecurityUtils.isMenuAuthorized(menuItem)) {
+        if (menuItem != null && SecurityUtils.isMenuAuthorized(menuItem)) {
             if (getItems().size() >= position) {
                 getItems().add(position, menuItem);
             }else {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/util/SecurityUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/util/SecurityUtils.java
@@ -58,7 +58,7 @@ public static boolean isMenuAuthorized(MainMenuItem item) {
         return clazz == null || isPageAuthorized(clazz);
     }
 
-    public static boolean isMenuAuthorized(MenuItem item) {
+    public static boolean isMenuAuthorized(@NotNull MenuItem item) {
         Class<? extends WebPage> clazz = item.getPageClass();
         List<String> authz = LeftMenuAuthzUtil.getAuthorizationsForPage(clazz);
         if (CollectionUtils.isNotEmpty(authz)) {