Repository: incubator-ignite Updated Branches: refs/heads/ignite-26 8bc850c2d -> 4307bca1e
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java index 3985380..4a0e4bf 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java @@ -139,7 +139,7 @@ public class GridSessionSetTaskAttributeSelfTest extends GridCommonAbstractTest return 1; } catch (InterruptedException e) { - throw new IgniteCheckedException("Failed to get attribute due to interruption.", e); + throw new IgniteException("Failed to get attribute due to interruption.", e); } return 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java index c3dde84..6a124ac 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java @@ -156,7 +156,7 @@ public class GridSessionTaskWaitJobAttributeSelfTest extends GridCommonAbstractT assert "testVal".equals(val) : "Invalid attribute value: " + val; } catch (InterruptedException e) { - throw new IgniteCheckedException("Failed to get attribute due to interruption.", e); + throw new IgniteException("Failed to get attribute due to interruption.", e); } return received.size() == SPLIT_COUNT ? ComputeJobResultPolicy.REDUCE : ComputeJobResultPolicy.WAIT; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java index b43555b..8117c0c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java @@ -241,7 +241,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { * @throws IgniteCheckedException If failed. */ private static void checkSessionAttributes(ComputeTaskSession ses, String prefix, WaitAttributeType type) - throws IgniteCheckedException { + throws IgniteException { assert ses != null; assert type != null; @@ -385,7 +385,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { } } catch (InterruptedException e) { - throw new IgniteCheckedException("Got interrupted while waiting for session attributes.", e); + throw new IgniteException("Got interrupted while waiting for session attributes.", e); } } @@ -464,7 +464,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { taskSes.waitForAttribute("done", true, 0); } catch (InterruptedException e) { - throw new IgniteCheckedException("Got interrupted while waiting for 'done' attribute.", e); + throw new IgniteException("Got interrupted while waiting for 'done' attribute.", e); } return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java index c3ade47..8ad806e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java @@ -114,7 +114,7 @@ public class GridEmbeddedFutureSelfTest extends GridCommonAbstractTest { catch (IgniteFutureTimeoutException e) { fail("Failed with timeout exception: " + e); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Failed with unhandled exception (normal behaviour): " + e); assertSame(x, e.getCause(x.getClass())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureListenPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureListenPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureListenPerformanceTest.java index f97de41..394e69c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureListenPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFutureListenPerformanceTest.java @@ -71,7 +71,7 @@ public class GridFutureListenPerformanceTest { try { t.get(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { e.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java index 65b287e..48b84fe 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapMapAbstractSelfTest.java @@ -668,7 +668,7 @@ public abstract class GridOffHeapMapAbstractSelfTest extends GridCommonAbstractT it.close(); } } - catch (IgniteCheckedException e) { + catch (IgniteException e) { e.printStackTrace(); } catch (InterruptedException e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java index 6f8e63c..3ce844d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java @@ -605,7 +605,7 @@ public abstract class GridOffHeapPartitionedMapAbstractSelfTest extends GridComm } } } - catch (IgniteCheckedException e) { + catch (IgniteException e) { fail("Unexpected exception caught: " + e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java index 6e7bcc6..4b15bcf 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java @@ -14,6 +14,7 @@ import org.apache.ignite.lifecycle.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; +import org.gridgain.grid.util.typedef.internal.*; /** * Lifecycle bean. @@ -28,7 +29,12 @@ public class GridTestLifecycleBean implements LifecycleBean { assert cache != null; - cache.loadCache(null, 0, GridTestConstants.LOAD_THREADS, GridTestConstants.ENTRY_COUNT); + try { + cache.loadCache(null, 0, GridTestConstants.LOAD_THREADS, GridTestConstants.ENTRY_COUNT); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java index 84be76e..a18f6c8 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java @@ -382,7 +382,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { } } } - catch (IgniteCheckedException e) { + catch (IgniteException e) { X.println("Message send failed", e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java index 0276456..cc23c6f 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java @@ -124,7 +124,7 @@ public class GridMultiSplitsLoadTest extends GridCommonAbstractTest { if (taskCnt % 500 == 0) info(stats.toString()); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { error("Failed to execute grid task.", e); fail(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java index 1e473f7..97bbcef 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java @@ -120,7 +120,7 @@ public class GridMultiSplitsRedeployLoadTest extends GridCommonAbstractTest { if (taskCnt % 500 == 0) info(stats.toString()); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { error("Failed to execute grid task.", e); fail(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java index fce9b85..9f4a3d9 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java @@ -145,7 +145,7 @@ public class GridSingleSplitsRedeployLoadTest extends GridCommonAbstractTest { info(stats.toString()); } } - catch (IgniteCheckedException e) { + catch (IgniteException e) { error("Failed to execute grid task.", e); fail(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java index b2d8a62..85dce31 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java @@ -112,7 +112,7 @@ public class GridSessionLoadTestTask extends ComputeTaskAdapter<Integer, Boolean Thread.sleep(100); } catch (InterruptedException e) { - throw new IgniteCheckedException("Thread interrupted.", e); + throw new IgniteException("Thread interrupted.", e); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java index 05de5b8..0baf20d 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; @@ -133,7 +132,7 @@ public class GridDsiClient implements Callable { if (res2 != null) srvStats = res2; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { e.printStackTrace(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java index e12cde9..d9dec14 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java @@ -12,6 +12,7 @@ package org.gridgain.loadtests.dsi; import org.apache.ignite.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.resources.*; +import org.gridgain.grid.util.typedef.internal.*; import org.springframework.context.*; /** @@ -38,7 +39,12 @@ public class GridDsiLifecycleBean implements LifecycleBean { break; case AFTER_GRID_START: - ignite.cache("PARTITIONED_CACHE").dataStructures().atomicSequence("ID", 0, true); + try { + ignite.cache("PARTITIONED_CACHE").dataStructures().atomicSequence("ID", 0, true); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } break; case BEFORE_GRID_STOP: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClient.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClient.java index e6ce2b5..15cbad0 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClient.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClient.java @@ -52,7 +52,7 @@ public class GridJobExecutionLoadTestClient implements Callable<Object> { txCnt.increment(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { e.printStackTrace(); } } @@ -189,7 +189,7 @@ public class GridJobExecutionLoadTestClient implements Callable<Object> { try { rmts.execute(GridJobExecutionLoadTestTask.class, null); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { e.printStackTrace(); } @@ -205,7 +205,7 @@ public class GridJobExecutionLoadTestClient implements Callable<Object> { } }); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { throw new IllegalStateException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java index d0f6735..653b93b 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java @@ -209,7 +209,7 @@ public class GridJobExecutionLoadTestClientSemaphore implements Callable<Object> try { rmts.execute(GridJobExecutionLoadTestTask.class, null); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { e.printStackTrace(); } @@ -225,7 +225,7 @@ public class GridJobExecutionLoadTestClientSemaphore implements Callable<Object> } }); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { throw new IllegalStateException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeLoadTest.java index 867af1f..6c84d97 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeLoadTest.java @@ -97,7 +97,7 @@ public class GridJobExecutionSingleNodeLoadTest { catch (ComputeTaskCancelledException ignored) { // No-op. } - catch (IgniteCheckedException e) { + catch (IgniteException e) { e.printStackTrace(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java index 1136fef..0ac9926 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java @@ -115,7 +115,7 @@ public class GridJobLoadTestJob implements ComputeJob { try { taskSes.setAttribute(String.valueOf(i), i); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { log.error("Set attribute failed.", e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java index f9b7084..50d4766 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java @@ -76,7 +76,7 @@ public class GridJobLoadTestSubmitter implements Runnable { futures.add(comp.<Integer>future()); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { // Should not be thrown since uses asynchronous execution. throw new IgniteException(e); } @@ -102,7 +102,7 @@ public class GridJobLoadTestSubmitter implements Runnable { catch (IgniteFutureCancelledException ignored) { ignite.log().info(">>> Task cancelled: " + fut.getTaskSession().getId()); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { ignite.log().warning( ">>> Get operation for completed task failed: " + fut.getTaskSession().getId(), e); } @@ -127,7 +127,7 @@ public class GridJobLoadTestSubmitter implements Runnable { futToCancel.cancel(); ignite.log().info("Task canceled: " + futToCancel.getTaskSession().getId()); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { ignite.log().warning(">>> Future cancellation failed: " + futToCancel.getTaskSession().getId(), e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask1.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask1.java b/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask1.java index 0071e15..6484a2f 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask1.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask1.java @@ -110,7 +110,7 @@ public class GridContinuousMapperTask1 extends ComputeTaskAdapter<Integer, Integ /** {@inheritDoc} */ @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteException { if (res.getException() != null) - throw new IgniteCheckedException(res.getException()); + throw new IgniteException(res.getException()); TestObject o = res.getData(); @@ -134,7 +134,7 @@ public class GridContinuousMapperTask1 extends ComputeTaskAdapter<Integer, Integ t.join(); } catch (InterruptedException e) { - throw new IgniteCheckedException(e); + throw new IgniteException(e); } return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/loadtests/streamer/EventClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/streamer/EventClosure.java b/modules/core/src/test/java/org/gridgain/loadtests/streamer/EventClosure.java index c0eec6d..f857f2f 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/streamer/EventClosure.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/streamer/EventClosure.java @@ -31,7 +31,7 @@ class EventClosure implements IgniteInClosure<IgniteStreamer> { try { streamer.addEvent(rnd.nextInt(rndRange)); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { X.println("Failed to add streamer event: " + e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java index b92b432..2583e73 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java @@ -179,7 +179,7 @@ public class GridHadoopMapReduceTest extends GridHadoopAbstractWordCountTest { try { return ggfs.exists(statPath); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { throw new IgniteException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java index 3bc4da8..41b5902 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java @@ -50,7 +50,7 @@ public class GridCacheAtomicFieldsQuerySelfTest extends GridCachePartitionedFiel fail("We don't support updates."); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { X.println("___ " + e.getMessage()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java b/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java index f0b5297..447662c 100644 --- a/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java +++ b/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java @@ -227,7 +227,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest { fail("IgniteCheckedException must have been thrown"); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Caught expected exception: " + e); } @@ -236,7 +236,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest { fail("IgniteCheckedException must have been thrown"); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Caught expected exception: " + e); } } @@ -264,7 +264,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest { fail("IgniteCheckedException must have been thrown"); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Caught expected exception: " + e); } @@ -274,7 +274,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest { fail("IgniteCheckedException must have been thrown"); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Caught expected exception: " + e); } @@ -284,7 +284,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest { fail("IgniteCheckedException must have been thrown"); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Caught expected exception: " + e); } @@ -294,7 +294,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest { fail("IgniteCheckedException must have been thrown"); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Caught expected exception: " + e); } @@ -304,7 +304,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest { fail("IgniteCheckedException must have been thrown"); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Caught expected exception: " + e); } @@ -314,7 +314,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest { fail("IgniteCheckedException must have been thrown"); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Caught expected exception: " + e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceConcurrentUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceConcurrentUndeploySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceConcurrentUndeploySelfTest.java index 9f638d1..27e79fc 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceConcurrentUndeploySelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceConcurrentUndeploySelfTest.java @@ -438,7 +438,7 @@ public class GridResourceConcurrentUndeploySelfTest extends GridCommonAbstractTe } } - throw new IgniteCheckedException("Node not found"); + throw new IgniteException("Node not found"); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java index ffb998d..544aa9a 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java @@ -104,7 +104,7 @@ public class GridResourceFieldInjectionSelfTest extends GridCommonAbstractTest { assert false : "Did not get exception for non-transient field."; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Got correct exception for non-transient field: " + e.getMessage()); } finally { @@ -123,7 +123,7 @@ public class GridResourceFieldInjectionSelfTest extends GridCommonAbstractTest { assert false : "Did not get exception for non-transient field."; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Got correct exception for non-transient field: " + e.getMessage()); } @@ -141,7 +141,7 @@ public class GridResourceFieldInjectionSelfTest extends GridCommonAbstractTest { assert false : "Did not get exception for unknown Spring bean name."; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Got correct exception for with unknown Spring bean name: " + e.getMessage()); } @@ -159,7 +159,7 @@ public class GridResourceFieldInjectionSelfTest extends GridCommonAbstractTest { assert false : "Did not get exception for different Spring bean classes."; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Got correct exception for for different Spring bean classes: " + e.getMessage()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIocSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIocSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIocSelfTest.java index af13906..c319b7a 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIocSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIocSelfTest.java @@ -220,7 +220,7 @@ public class GridResourceIocSelfTest extends GridCommonAbstractTest { assert false : "Task must be undeployed"; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Caught expected exception: " + e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.java index 3188d09..7e9de93 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.java @@ -275,7 +275,7 @@ public class GridResourceIsolatedClassLoaderSelfTest extends GridCommonAbstractT assert false : "SharedResourceTask4 should not be allowed to deploy."; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Received expected exception: " + e); } finally { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.java index f71a4b7..886fe0e 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.java @@ -254,7 +254,7 @@ public class GridResourceIsolatedTaskSelfTest extends GridCommonAbstractTest { assert false : "SharedResourceTask4 should not be allowed to deploy."; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Received expected exception: " + e); } finally { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.java index f36ccbd..c7c4b9d 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.java @@ -151,7 +151,7 @@ public class GridResourceSharedUndeploySelfTest extends GridCommonAbstractTest { assert false : "SharedResourceTask4 should not be allowed to deploy."; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Received expected exception: " + e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridServiceInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridServiceInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridServiceInjectionSelfTest.java index 92f3e30..ae87ebd 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridServiceInjectionSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridServiceInjectionSelfTest.java @@ -130,7 +130,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme fail(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { assertTrue(e.getMessage().startsWith("Remote job threw user exception")); } } @@ -227,7 +227,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme fail(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { assertTrue(e.getMessage().startsWith("Remote job threw user exception")); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/urideploy/src/test/java/org/gridgain/grid/p2p/GridP2PDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/gridgain/grid/p2p/GridP2PDisabledSelfTest.java b/modules/urideploy/src/test/java/org/gridgain/grid/p2p/GridP2PDisabledSelfTest.java index 387e29d..ca97949 100644 --- a/modules/urideploy/src/test/java/org/gridgain/grid/p2p/GridP2PDisabledSelfTest.java +++ b/modules/urideploy/src/test/java/org/gridgain/grid/p2p/GridP2PDisabledSelfTest.java @@ -97,7 +97,7 @@ public class GridP2PDisabledSelfTest extends GridCommonAbstractTest { assert false; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Received expected exception: " + e); } }