[CONJ-659] correction of nanosecond ATOI handling to permit resultset…

….getTimestamp()
mariadb-corporation · Dec 19, 2018 · af730b0 · af730b0
1 parent 4eab176
commit af730b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/org/mariadb/jdbc/internal/com/read/resultset/rowprotocol/TextRowProtocol.java b/src/main/java/org/mariadb/jdbc/internal/com/read/resultset/rowprotocol/TextRowProtocol.java
@@ -648,7 +648,7 @@ public Timestamp getInternalTimestamp(ColumnInformation columnInfo, Calendar use
 
         //fix non leading tray for nanoseconds
         if (nanoBegin > 0) {
-          for (int begin = length - (nanoBegin - pos); begin < 6; begin++) {
+          for (int begin = 0; begin < 6 - (pos + length - nanoBegin - 1); begin++) {
             timestampsPart[6] = timestampsPart[6] * 10;
           }
         }

diff --git a/src/test/java/org/mariadb/jdbc/MariaDbPoolDataSourceTest.java b/src/test/java/org/mariadb/jdbc/MariaDbPoolDataSourceTest.java
@@ -470,6 +470,7 @@ public void ensureClosed() throws Throwable {
         connection.isValid(10_000);
       }
 
+      Thread.sleep(500);
       assertTrue(getCurrentConnections() > initialConnection);
     }
     Thread.sleep(500); //ensure that previous close are effective