From 4c8014f99aedee4becaf9a043dafd25c9ba461f7 Mon Sep 17 00:00:00 2001 From: Christian Himpe Date: Thu, 2 Nov 2023 22:06:52 +0100 Subject: [PATCH 1/2] Add test for two empty strings in binary comparator --- .../main/java/com/arcadedb/serializer/BinaryComparator.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/engine/src/main/java/com/arcadedb/serializer/BinaryComparator.java b/engine/src/main/java/com/arcadedb/serializer/BinaryComparator.java index 02e6f6d2ec..2226c381d0 100644 --- a/engine/src/main/java/com/arcadedb/serializer/BinaryComparator.java +++ b/engine/src/main/java/com/arcadedb/serializer/BinaryComparator.java @@ -396,6 +396,9 @@ public static boolean equalsString(final String buffer1, final String buffer2) { if (buffer1 == null || buffer2 == null) return false; + if (buffer1.equals("") && buffer2.equals("")) + return true; + return equalsBytes(buffer1.getBytes(DatabaseFactory.getDefaultCharset()), buffer2.getBytes(DatabaseFactory.getDefaultCharset())); } From 738d5c66aeaa7c0208086a8414cfe9b49cc2bf2c Mon Sep 17 00:00:00 2001 From: Christian Himpe Date: Fri, 3 Nov 2023 08:09:51 +0100 Subject: [PATCH 2/2] Use isEmpty instead of equals --- .../src/main/java/com/arcadedb/serializer/BinaryComparator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/src/main/java/com/arcadedb/serializer/BinaryComparator.java b/engine/src/main/java/com/arcadedb/serializer/BinaryComparator.java index 2226c381d0..facc09522c 100644 --- a/engine/src/main/java/com/arcadedb/serializer/BinaryComparator.java +++ b/engine/src/main/java/com/arcadedb/serializer/BinaryComparator.java @@ -396,7 +396,7 @@ public static boolean equalsString(final String buffer1, final String buffer2) { if (buffer1 == null || buffer2 == null) return false; - if (buffer1.equals("") && buffer2.equals("")) + if (buffer1.isEmpty() && buffer2.isEmpty()) return true; return equalsBytes(buffer1.getBytes(DatabaseFactory.getDefaultCharset()),