fix charEncode when all string are empty or null

yxw839841231 · Oct 19, 2021 · bfb8a35 · bfb8a35
1 parent 259592d
commit bfb8a35
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/jpos/src/main/java/org/jpos/iso/ISOUtil.java b/jpos/src/main/java/org/jpos/iso/ISOUtil.java
@@ -1665,7 +1665,8 @@ public static String charEncode (char delimiter, String... ss) {
         StringBuilder sb = new StringBuilder();
         for (int j = 0, ssLength = ss.length; j < ssLength; j++) {
             String s = ss[j];
-            if (s == null || s.length() == 0) {
+            final boolean notLast = j < ssLength - 1;
+            if (notLast && (s == null || s.length() == 0)) {
                 sb.append(delimiter);
                 continue;
             }
@@ -1676,7 +1677,7 @@ public static String charEncode (char delimiter, String... ss) {
                 }
                 sb.append(c);
             }
-            if (j < ssLength - 1) {
+            if (notLast) {
                 sb.append(delimiter);
             }
         }

diff --git a/jpos/src/test/java/org/jpos/iso/ISOUtilTest.java b/jpos/src/test/java/org/jpos/iso/ISOUtilTest.java
@@ -5183,12 +5183,14 @@ public void testStringDLE() {
     @Test
     public void testCharEncodeAndDecode() {
         assertEquals("", ISOUtil.charEncode(':'), "error encoding \"\"");
+        assertEquals(":", ISOUtil.charEncode(':', "",""), "error encoding \"\",\"\"");
         assertEquals("a:b:c", ISOUtil.charEncode(':', "a", "b", "c"), "error encoding \"a:b:c\"");
         assertEquals("\\::\\\\:c", ISOUtil.charEncode(':', ":", "\\", "c"), "error encoding \"\\::\\\\:c\"");
         assertEquals(":b:c", ISOUtil.charEncode(':', "", "b", "c"), "error encoding \":b:c\"");
         assertEquals("::b:c", ISOUtil.charEncode(':', "", "", "b", "c"), "error encoding \"::b:c\"");
 
         assertArrayEquals(new String[] {""}, ISOUtil.charDecode(':',""), "error decoding \"\"");
+        assertArrayEquals(new String[] {"", ""}, ISOUtil.charDecode(':',":"), "error decoding \":\"");
         assertArrayEquals(new String[] { "a", "b", "c" }, ISOUtil.charDecode(':', "a:b:c"), "error decoding \"a:b:c\"");
         assertArrayEquals(new String[] { ":", "\\", "c" }, ISOUtil.charDecode(':', "\\::\\\\:c"), "error decoding \"\\::\\\\:c\"");
         assertArrayEquals(new String[] { "", "b", "c" }, ISOUtil.charDecode(':', ":b:c"), "error decoding \":b:c\"");