Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 886651893F for ; Mon, 18 Jan 2016 08:25:24 +0000 (UTC) Received: (qmail 4694 invoked by uid 500); 18 Jan 2016 08:25:24 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 4556 invoked by uid 500); 18 Jan 2016 08:25:24 -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 4488 invoked by uid 99); 18 Jan 2016 08:25:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jan 2016 08:25:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C9F55E0505; Mon, 18 Jan 2016 08:25:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Mon, 18 Jan 2016 08:25:28 -0000 Message-Id: <09fb6caae2d948d084587f9fa5b70d5f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/19] ignite git commit: Fixed compatibility issues from commit 457a9ae. Fixed compatibility issues from commit 457a9ae. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cd44be5f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cd44be5f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cd44be5f Branch: refs/heads/ignite-2316 Commit: cd44be5f0398148313f4c8d1802302c7a04f16ff Parents: 457a9ae Author: sboikov Authored: Wed Jan 13 12:19:16 2016 +0300 Committer: sboikov Committed: Wed Jan 13 12:19:16 2016 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java | 2 +- .../processors/cache/distributed/near/GridNearTxFinishFuture.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cd44be5f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java index 95fdeb6..8f1d9a2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java @@ -165,7 +165,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri prepareMarshalCacheObjects(nearEvicted, cctx); - if (err != null && errBytes == null) + if (errBytes == null) errBytes = ctx.marshaller().marshal(err); } http://git-wip-us.apache.org/repos/asf/ignite/blob/cd44be5f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java index 1b40d6e..26e189b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java @@ -68,7 +68,7 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu public static final IgniteProductVersion FINISH_NEAR_ONE_PHASE_SINCE = IgniteProductVersion.fromString("1.4.0"); /** */ - public static final IgniteProductVersion WAIT_REMOTE_TXS_SINCE = IgniteProductVersion.fromString("1.5.0"); + public static final IgniteProductVersion WAIT_REMOTE_TXS_SINCE = IgniteProductVersion.fromString("1.5.1"); /** */ private static final long serialVersionUID = 0L;