[ofbiz-framework] branch release22.01 updated: Fixed: Calendar in Work Effort does not work (OFBIZ-12665)

[nmalin]

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 d9e974633b Fixed: Calendar in Work Effort does not work (OFBIZ-12665)
d9e974633b is described below

commit d9e974633b871aed3cd66250398ea3db61a86a0d
Author: Nicolas Malin <nicolas.ma...@nereide.fr>
AuthorDate: Fri Jul 15 14:38:16 2022 +0200

    Fixed: Calendar in Work Effort does not work (OFBIZ-12665)
    
    Fix a null pointer exception when a menu extend a menu with empty item.
    In this case, we use a empty link for the extended menu.
    
    Thanks to Jacques Leroux for the alert
---
 .../ofbiz/widget/model/CommonWidgetModels.java     | 26 ++++++++++++++++++++++
 .../apache/ofbiz/widget/model/ModelMenuItem.java   |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java
 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java
index f92c2d2292..b05c6314b0 100644
--- 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java
+++ 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java
@@ -444,6 +444,32 @@ public final class CommonWidgetModels {
             this.height = "";
         }
 
+        // Empty link constructor
+        public Link() {
+            this.autoEntityParameters = null;
+            this.autoServiceParameters = null;
+            this.callback = null;
+            this.encode = false;
+            this.fullPath = false;
+            this.idExdr = FlexibleStringExpander.getInstance("");
+            this.image = null;
+            this.linkType = "";
+            this.nameExdr = FlexibleStringExpander.getInstance("");
+            this.parameterList = Collections.emptyList();
+            this.prefixExdr = FlexibleStringExpander.getInstance("");
+            this.secure = false;
+            this.styleExdr = FlexibleStringExpander.getInstance("");
+            this.targetExdr = FlexibleStringExpander.getInstance("");
+            this.targetWindowExdr = FlexibleStringExpander.getInstance("");
+            this.textExdr = FlexibleStringExpander.getInstance("");
+            this.urlMode = "intra-app";
+            this.size = null;
+            this.requestConfirmation = false;
+            this.confirmationMsgExdr = FlexibleStringExpander.getInstance("");
+            this.width = "";
+            this.height = "";
+        }
+
         public AutoEntityParameters getAutoEntityParameters() {
             return autoEntityParameters;
         }
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 3ebb034b66..e9b1455752 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
@@ -693,7 +693,7 @@ public class ModelMenuItem extends ModelWidget {
             this.linkMenuItem = parentMenuItem;
             this.link = originLink != null
                     ? originLink.link
-                    : null;
+                    : new Link();
         }
 
         public MenuLink(GenericValue portalPage, ModelMenuItem parentMenuItem, 
Locale locale) {