ignite-201 - Removed DataStructureRemovedException in favor of IllegalStateException.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a0e1772f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a0e1772f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a0e1772f Branch: refs/heads/ignite-96 Commit: a0e1772f0d44716bcdb963451e23916092327431 Parents: d991866 Author: Dmitiry Setrakyan <dsetrak...@gridgain.com> Authored: Sun Feb 8 17:46:34 2015 -0800 Committer: Dmitiry Setrakyan <dsetrak...@gridgain.com> Committed: Sun Feb 8 17:46:34 2015 -0800 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheUtils.java | 6 +++--- .../datastructures/GridCacheQueueApiSelfAbstractTest.java | 4 ++-- .../cache/datastructures/GridCacheSetAbstractSelfTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0e1772f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index 142017f..adf5c07 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -48,10 +48,10 @@ import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*; -import static org.apache.ignite.internal.IgniteNodeAttributes.*; import static org.apache.ignite.internal.GridTopic.*; +import static org.apache.ignite.internal.IgniteNodeAttributes.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; +import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*; /** * Cache utility methods. @@ -1179,7 +1179,7 @@ public class GridCacheUtils { try { return cmd.call(); } - catch (IgniteCheckedException | IgniteException e) { + catch (IgniteCheckedException | IgniteException | IllegalStateException e) { throw e; } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0e1772f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java index 00c2f57..7a43ff4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java @@ -393,7 +393,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends IgniteCollection fail("Queue failed"); } - catch (IgniteException e) { + catch (IgniteException | IllegalStateException e) { putLatch.countDown(); assert e.getMessage().contains("removed"); @@ -438,7 +438,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends IgniteCollection fail("Queue must be removed."); } - catch (IgniteException e) { + catch (IgniteException | IllegalStateException e) { assert e.getMessage().contains("removed"); assert queue.removed(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0e1772f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java index e76cff1..11b39e5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java @@ -761,7 +761,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr IgniteInternalFuture<?> fut; try { - fut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + fut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { try { while (!stop.get()) {
