Repository: ignite Updated Branches: refs/heads/ignite-1537 5d6517da1 -> cf9767e57
ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cf9767e5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cf9767e5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cf9767e5 Branch: refs/heads/ignite-1537 Commit: cf9767e57a481c390c35be87b0af5bb2cae18303 Parents: 5d6517d Author: sboikov <[email protected]> Authored: Tue Dec 15 10:54:46 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Dec 15 10:54:46 2015 +0300 ---------------------------------------------------------------------- .../cache/datastructures/CacheDataStructuresManager.java | 5 +++-- .../dht/IgniteAtomicLongChangingTopologySelfTest.java | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cf9767e5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java index f56cbf8..47c3dd9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java @@ -39,6 +39,7 @@ import org.apache.ignite.cache.CacheEntryEventSerializableFilter; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.cluster.ClusterTopologyException; import org.apache.ignite.internal.IgniteKernal; +import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheAdapter; import org.apache.ignite.internal.processors.cache.GridCacheAffinityManager; @@ -493,7 +494,7 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { true).get(); } catch (IgniteCheckedException e) { - if (e.hasCause(ClusterTopologyException.class)) { + if (e.hasCause(ClusterTopologyCheckedException.class)) { if (log.isDebugEnabled()) log.debug("RemoveSetData job failed, will retry: " + e); @@ -516,7 +517,7 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { true).get(); } catch (IgniteCheckedException e) { - if (e.hasCause(ClusterTopologyException.class)) { + if (e.hasCause(ClusterTopologyCheckedException.class)) { if (log.isDebugEnabled()) log.debug("RemoveSetData job failed, will retry: " + e); http://git-wip-us.apache.org/repos/asf/ignite/blob/cf9767e5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java index 74cb9ef..f14dc5a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java @@ -399,8 +399,14 @@ public class IgniteAtomicLongChangingTopologySelfTest extends GridCommonAbstract /** * @param i Node index. + * @param startLatch Thread start latch. + * @param run Run flag. + * @throws Exception If failed. + * @return Threads future. */ - private IgniteInternalFuture<?> startNodeAndCreaterThread(final int i, final CountDownLatch startLatch, final AtomicBoolean run) + private IgniteInternalFuture<?> startNodeAndCreaterThread(final int i, + final CountDownLatch startLatch, + final AtomicBoolean run) throws Exception { return multithreadedAsync(new Runnable() { @Override public void run() {
