From commits-return-124509-archive-asf-public=cust-asf.ponee.io@ignite.apache.org Tue May 7 15:21:23 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id E96A0180763 for ; Tue, 7 May 2019 17:21:22 +0200 (CEST) Received: (qmail 65420 invoked by uid 500); 7 May 2019 15:21:22 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 65409 invoked by uid 99); 7 May 2019 15:21:22 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 May 2019 15:21:22 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 47E3787281; Tue, 7 May 2019 15:21:22 +0000 (UTC) Date: Tue, 07 May 2019 15:21:21 +0000 To: "commits@ignite.apache.org" Subject: [ignite] 13/41: gg-17381 GridCompatibilityJdbcFromCurClientToPrevSrvTest#runJdbcThinTests fails in master fixed MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: amashenkov@apache.org In-Reply-To: <155724246853.23844.1349822895184128385@gitbox.apache.org> References: <155724246853.23844.1349822895184128385@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: ignite X-Git-Refname: refs/heads/gg-18540 X-Git-Reftype: branch X-Git-Rev: a0b683e4c437ec7c68815fc1da326a723725adaa X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190507152122.47E3787281@gitbox.apache.org> 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 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); }