From 30db65ab50fe458c4350130ddb1a3a9d9b8d9a20 Mon Sep 17 00:00:00 2001 From: iroqueta Date: Mon, 29 Dec 2025 12:39:17 -0300 Subject: [PATCH] Ajax call gives error with empty images As a result of commit 8d69a59bcf918ac2e09a869f922cbff490782713 made to solve Issue 207440, the case of handling empty images in ajax calls raised in Issue 207532 was broken. A change is made to the original change so that the two cases raised work. Issue: 207532 --- common/src/main/java/com/genexus/CommonUtil.java | 6 +----- java/src/main/java/com/genexus/internet/HttpContext.java | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/com/genexus/CommonUtil.java b/common/src/main/java/com/genexus/CommonUtil.java index 02d44a005..83b8674b7 100644 --- a/common/src/main/java/com/genexus/CommonUtil.java +++ b/common/src/main/java/com/genexus/CommonUtil.java @@ -854,11 +854,7 @@ public static boolean dateCompare( Date left , Date right) public static int strcmp( String left , String right ) { - return Comparator.nullsFirst(String::compareTo) - .compare( - left == null ? null : rtrim(left), - right == null ? null : rtrim(right) - ); + return rtrim(left).compareTo(rtrim(right)); } public static boolean strcmp2( String left , diff --git a/java/src/main/java/com/genexus/internet/HttpContext.java b/java/src/main/java/com/genexus/internet/HttpContext.java index cf7ed307e..bde129d97 100644 --- a/java/src/main/java/com/genexus/internet/HttpContext.java +++ b/java/src/main/java/com/genexus/internet/HttpContext.java @@ -727,7 +727,7 @@ public String getBuildNumber(int buildN){ public String convertURL(String file) { String url = ""; - if (file.equals("")) + if (file == null || file.equals("")) { return ""; }