ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amashen...@apache.org
Subject [ignite] 13/41: gg-17381 GridCompatibilityJdbcFromCurClientToPrevSrvTest#runJdbcThinTests fails in master fixed
Date Tue, 07 May 2019 15:21:21 GMT
This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a commit to branch gg-18540
in repository https://gitbox.apache.org/repos/asf/ignite.git

commit a0b683e4c437ec7c68815fc1da326a723725adaa
Author: alapin <lapin1702@gmail.com>
AuthorDate: Thu Apr 25 12:55:15 2019 +0300

    gg-17381 GridCompatibilityJdbcFromCurClientToPrevSrvTest#runJdbcThinTests fails in master
fixed
---
 .../internal/processors/odbc/jdbc/JdbcQueryExecuteResult.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteResult.java
index 58be2db..73fc29c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteResult.java
@@ -25,6 +25,8 @@ import org.apache.ignite.internal.sql.optimizer.affinity.PartitionResult;
 import org.apache.ignite.internal.sql.optimizer.affinity.PartitionResultMarshaler;
 import org.apache.ignite.internal.util.typedef.internal.S;
 
+import static org.apache.ignite.internal.processors.odbc.jdbc.JdbcConnectionContext.VER_2_8_0;
+
 /**
  * JDBC query execute result.
  */
@@ -140,7 +142,7 @@ public class JdbcQueryExecuteResult extends JdbcResult {
 
         writer.writeBoolean(partRes != null);
 
-        if (partRes != null)
+        if (ver.compareTo(VER_2_8_0) >= 0 && partRes != null)
             PartitionResultMarshaler.marshal(writer, partRes);
     }
 
@@ -163,7 +165,7 @@ public class JdbcQueryExecuteResult extends JdbcResult {
             updateCnt = reader.readLong();
         }
 
-        if (reader.readBoolean())
+        if (ver.compareTo(VER_2_8_0) >= 0 && reader.readBoolean())
             partRes = PartitionResultMarshaler.unmarshal(reader);
     }
 


Mime
View raw message