Repository: incubator-ignite Updated Branches: refs/heads/ignite-1087 7725de9a9 -> 25e1a14ee
#ignite-1087: fix test. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25e1a14e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25e1a14e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25e1a14e Branch: refs/heads/ignite-1087 Commit: 25e1a14ee242b083c163dec005cc248a80cad3bd Parents: 7725de9 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Jul 13 21:46:17 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Jul 13 21:46:17 2015 +0300 ---------------------------------------------------------------------- .../processors/affinity/GridAffinityAssignmentCache.java | 6 ++++-- .../internal/processors/cache/CacheAffinityCallSelfTest.java | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25e1a14e/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java index 6989385..8309c14 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.cluster.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.typedef.*; @@ -135,7 +136,7 @@ public class GridAffinityAssignmentCache { stopping = true; IgniteCheckedException err = - new IgniteCheckedException("Failed to wait for topology update, cache (or node) is stopping."); + new ClusterTopologyCheckedException("Failed to wait for topology update, cache (or node) is stopping."); for (AffinityReadyFuture fut : readyFuts.values()) fut.onDone(err); @@ -313,7 +314,8 @@ public class GridAffinityAssignmentCache { fut.onDone(topVer); } else if (stopping) - fut.onDone(new IgniteCheckedException("Failed to wait for topology update, cache (or node) is stopping.")); + fut.onDone(new ClusterTopologyCheckedException( + "Failed to wait for topology update, cache (or node) is stopping.")); return fut; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25e1a14e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java index 64e4d67..2d2d158 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java @@ -139,10 +139,6 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest { assertTrue("Incorrect error message. [mes=" + e.getMessage() + "].", e.getMessage().contains("Topology projection is empty")); } - catch(IgniteException e) { - assertTrue("Incorrect error message. [mes=" + e.getMessage() + "].", - e.getMessage().contains("cache (or node) is stopping")); - } stopGrid(SERVERS_COUNT); }
