[CONJ-236] correction on using resultset.getInt on a preparedStatemen…

…t on an signed smallInt negative value.
mariadb-corporation · Dec 26, 2015 · 88c9f30 · 88c9f30
1 parent 988e83c
commit 88c9f30
Show file tree

Hide file tree

Showing 3 changed files with 446 additions and 8 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/queryresults/MariaDbValueObject.java b/src/main/java/org/mariadb/jdbc/internal/queryresults/MariaDbValueObject.java
@@ -334,9 +334,10 @@ private int getTinyInt() throws SQLException {
     private int getSmallInt() throws SQLException {
         int value = ((rawBytes[0] & 0xff) | ((rawBytes[1] & 0xff) << 8));
         if (!columnInfo.isSigned()) {
-            value = value & 0xffff;
+            return value & 0xffff;
         }
-        return value;
+        //short cast here is important : -1 will be received as -1, -1 -> 65535
+        return (short) value;
     }
 
     private long getMediumInt() throws SQLException {
@@ -1253,7 +1254,7 @@ public boolean getBoolean() {
             return false;
         }
         final String rawVal = new String(rawBytes, StandardCharsets.UTF_8);
-        return rawVal.equalsIgnoreCase("true") || rawVal.equals("1") || (rawBytes[0] & 0x1) == 1;
+        return rawVal.equalsIgnoreCase("true") || rawVal.equals("1") || (rawBytes[0] & 0xff) == 1;
     }
 
     /**