[CONJ-901] ArrayIndexOutOfBoundsException on StandardReadableByteBuf.…

…readByte error
mariadb-corporation · Oct 22, 2021 · 1ea7c07 · 1ea7c07
1 parent 54ac944
commit 1ea7c07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/client/context/BaseContext.java b/src/main/java/org/mariadb/jdbc/client/context/BaseContext.java
@@ -42,7 +42,7 @@ public BaseContext(
     this.serverStatus = handshake.getServerStatus();
     this.version = handshake.getVersion();
     this.eofDeprecated = (clientCapabilities & Capabilities.CLIENT_DEPRECATE_EOF) > 0;
-    this.skipMeta = (serverCapabilities & Capabilities.MARIADB_CLIENT_CACHE_METADATA) > 0;
+    this.skipMeta = (clientCapabilities & Capabilities.MARIADB_CLIENT_CACHE_METADATA) > 0;
     this.extendedInfo = (serverCapabilities & Capabilities.MARIADB_CLIENT_EXTENDED_TYPE_INFO) > 0;
     this.conf = conf;
     this.database = conf.database();

diff --git a/src/main/java/org/mariadb/jdbc/client/impl/ConnectionHelper.java b/src/main/java/org/mariadb/jdbc/client/impl/ConnectionHelper.java
@@ -144,8 +144,8 @@ public static long initializeClientCapabilities(
             | Capabilities.CLIENT_SESSION_TRACK
             | Capabilities.MARIADB_CLIENT_EXTENDED_TYPE_INFO;
 
-    if (Boolean.parseBoolean(
-        configuration.nonMappedOptions().getProperty("enableSkipMeta", "true"))) {
+    if (Boolean.parseBoolean(configuration.nonMappedOptions().getProperty("enableSkipMeta", "true"))
+        && (serverCapabilities & Capabilities.MARIADB_CLIENT_CACHE_METADATA) != 0) {
       capabilities |= Capabilities.MARIADB_CLIENT_CACHE_METADATA;
     }