Merge remote-tracking branch 'origin/3.10' into 3.11

JumpMind · Oct 30, 2019 · 13bf32a · 13bf32a
2 parents 0ab1d6f + 72ab1ab
commit 13bf32a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java
@@ -405,9 +405,11 @@ protected Object getObjectValue(String value, Column column, BinaryEncoding enco
                 String charValue = value.toString();
                 if ((StringUtils.isBlank(charValue) && getDdlBuilder().getDatabaseInfo().isBlankCharColumnSpacePadded())
                         || (StringUtils.isNotBlank(charValue) && getDdlBuilder().getDatabaseInfo().isNonBlankCharColumnSpacePadded())) {
-                    if (column.getCharOctetLength() == 0 || column.getSizeAsInt() == column.getCharOctetLength()) {
+                    if (column.getSizeAsInt() != column.getCharOctetLength()) {
+                        // using multiple-byte character set, the size is maximum number of characters
                         objectValue = StringUtils.rightPad(charValue, column.getSizeAsInt(), ' ');
                     } else {
+                        // single-byte character set or field defined as number of bytes
                         objectValue = charValue + StringUtils.repeat(" ", column.getCharOctetLength() - value.getBytes().length);
                     }
                 }