# master minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7494a86b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7494a86b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7494a86b Branch: refs/heads/ignite-752 Commit: 7494a86b9ce166e547e7e5cad14f7202ab597b97 Parents: d8f86f1 Author: sboikov <sboi...@gridgain.com> Authored: Mon Jul 20 12:31:01 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jul 20 12:36:02 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtTxPrepareFuture.java | 9 ++++----- .../near/GridCachePartitionedMultiNodeFullApiSelfTest.java | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7494a86b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index af0fbdf..6efa4d8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -256,7 +256,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter MiniFuture f = (MiniFuture)fut; if (f.node().id().equals(nodeId)) { - f.onResult(new ClusterTopologyCheckedException("Remote node left grid: " + nodeId)); + f.onNodeLeft(new ClusterTopologyCheckedException("Remote node left grid: " + nodeId)); return true; } @@ -873,12 +873,11 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter assert req.transactionNodes() != null; - //noinspection TryWithIdenticalCatches try { cctx.io().send(n, req, tx.ioPolicy()); } catch (ClusterTopologyCheckedException e) { - fut.onResult(e); + fut.onNodeLeft(e); } catch (IgniteCheckedException e) { fut.onResult(e); @@ -933,7 +932,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter cctx.io().send(nearMapping.node(), req, tx.system() ? UTILITY_CACHE_POOL : SYSTEM_POOL); } catch (ClusterTopologyCheckedException e) { - fut.onResult(e); + fut.onNodeLeft(e); } catch (IgniteCheckedException e) { fut.onResult(e); @@ -1148,7 +1147,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter /** * @param e Node failure. */ - void onResult(ClusterTopologyCheckedException e) { + void onNodeLeft(ClusterTopologyCheckedException e) { if (log.isDebugEnabled()) log.debug("Remote node left grid while sending or waiting for reply (will ignore): " + this); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7494a86b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java index a5e7a31..7572aaf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java @@ -372,7 +372,9 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti boolean nearEnabled = cache2.getConfiguration(CacheConfiguration.class).getNearConfiguration() != null; assertEquals(nearEnabled ? 2 : 0, cache2.localSize(NEAR)); - assertEquals(0, cache2.localSize(CachePeekMode.ALL) - cache2.localSize(NEAR)); + + if (cacheMode() != REPLICATED) + assertEquals(0, cache2.localSize(CachePeekMode.ALL) - cache2.localSize(NEAR)); } /**
