(ofbiz-framework) branch trunk updated: Fixed: Error viewing entities with fromDate key in entity maintenance (OFBIZ-13222)

[nmalin]

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

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


The following commit(s) were added to refs/heads/trunk by this push:
     new 3bd09dd009 Fixed: Error viewing entities with fromDate key in entity 
maintenance (OFBIZ-13222)
3bd09dd009 is described below

commit 3bd09dd009584ca2890196d9df917a164863c829
Author: Nicolas Malin <nicolas.ma...@nereide.fr>
AuthorDate: Tue Apr 29 15:41:08 2025 +0200

    Fixed: Error viewing entities with fromDate key in entity maintenance 
(OFBIZ-13222)
    
    Fix NPE with previous commit when we use 'create' button from webtools
---
 .../src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java 
b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java
index 7459658ce6..666820aad6 100644
--- 
a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java
+++ 
b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java
@@ -593,8 +593,11 @@ public final class EntityUtil {
      */
     public static String entityToPath(GenericValue gv) {
         StringBuilder path = new StringBuilder(gv.getEntityName());
-        for (String pkName : gv.getModelEntity().getPkFieldNames()) {
-            path.append("/").append(UtilCodec.encodeUrl(gv.getString(pkName)));
+        List<String> pkFieldNames = gv.getModelEntity().getPkFieldNames();
+        if (pkFieldNames.stream().noneMatch(pkName -> gv.get(pkName) == null)) 
{
+            for (String pkName : pkFieldNames) {
+                
path.append("/").append(UtilCodec.encodeUrl(gv.getString(pkName)));
+            }
         }
         return path.toString();
     }