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-2236 Commit: cd44be5f0398148313f4c8d1802302c7a04f16ff Parents: 457a9ae Author: sboikov <sboi...@gridgain.com> Authored: Wed Jan 13 12:19:16 2016 +0300 Committer: sboikov <sboi...@gridgain.com> 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<K, V> 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;