Merge remote-tracking branch 'origin/pr/128' into develop

mariadb-corporation · Dec 20, 2018 · c742e2b · c742e2b
2 parents 1c604d1 + e18e035
commit c742e2b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbClob.java b/src/main/java/org/mariadb/jdbc/MariaDbClob.java
@@ -250,6 +250,7 @@ public long length() {
       } else if (byteValue < 0xF0) {
         i += 3;
       } else if (byteValue < 0xF8) {
+        len++;
         i += 4;
       } else {
         throw new UncheckedIOException("invalid UTF8", new CharacterCodingException());

diff --git a/src/test/java/org/mariadb/jdbc/MariaDbClobTest.java b/src/test/java/org/mariadb/jdbc/MariaDbClobTest.java
@@ -19,7 +19,7 @@ public class MariaDbClobTest {
   @Test
   public void length() {
     MariaDbClob clob = new MariaDbClob(bytes);
-    assertEquals(9, clob.length());
+    assertEquals(10, clob.length());
 
     MariaDbClob clob2 = new MariaDbClob(bytes, 2, 3);
     assertEquals(3, clob2.length());
@@ -30,6 +30,7 @@ public void getSubString() throws SQLException {
     MariaDbClob clob = new MariaDbClob(bytes);
     assertEquals("abcde🙏", clob.getSubString(1, 7));
     assertEquals("abcde🙏fgh", clob.getSubString(1, 20));
+    assertEquals("abcde🙏fgh", clob.getSubString(1, (int) clob.length()));
     assertEquals("ab", clob.getSubString(1, 2));
     assertEquals("🙏", clob.getSubString(6, 2));