Skip to content

Commit c0b34b7

Browse files
authored
Ajax call gives error with empty images (#1075)
As a result of commit 8d69a59 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
1 parent 4dc6684 commit c0b34b7

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

common/src/main/java/com/genexus/CommonUtil.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -854,11 +854,7 @@ public static boolean dateCompare( Date left , Date right)
854854
public static int strcmp( String left ,
855855
String right )
856856
{
857-
return Comparator.nullsFirst(String::compareTo)
858-
.compare(
859-
left == null ? null : rtrim(left),
860-
right == null ? null : rtrim(right)
861-
);
857+
return rtrim(left).compareTo(rtrim(right));
862858
}
863859

864860
public static boolean strcmp2( String left ,

java/src/main/java/com/genexus/internet/HttpContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ public String getBuildNumber(int buildN){
727727
public String convertURL(String file)
728728
{
729729
String url = "";
730-
if (file.equals(""))
730+
if (file == null || file.equals(""))
731731
{
732732
return "";
733733
}

0 commit comments

Comments
 (0)