[ofbiz-framework] branch release22.01 updated: Fixed: MenuItem doesn't follow correctly extended informations (OFBIZ-12628)

[nm...@apache.org]

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

nmalin pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release22.01 by this push:
     new d95c23cbd3 Fixed: MenuItem doesn't follow correctly extended informations (OFBIZ-12628)
d95c23cbd3 is described below

commit d95c23cbd3243fb8f90ed5eeab2b9e6179ba8338
Author: Nicolas Malin <ni...@nereide.fr>
AuthorDate: Fri Jul 1 17:35:17 2022 +0200

    Fixed: MenuItem doesn't follow correctly extended informations (OFBIZ-12628)
    
    Fix a null pointer exception when the extended menu have an entry without link.
    
    Thanks to Jacques Leroux for the alert
---
 .../src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java
index 5c54bb3225..3ebb034b66 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java
@@ -691,7 +691,9 @@ public class ModelMenuItem extends ModelWidget {
 
         public MenuLink(MenuLink originLink, ModelMenuItem parentMenuItem) {
             this.linkMenuItem = parentMenuItem;
-            this.link = originLink.link;
+            this.link = originLink != null
+                    ? originLink.link
+                    : null;
         }
 
         public MenuLink(GenericValue portalPage, ModelMenuItem parentMenuItem, Locale locale) {