ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [3/4] incubator-ignite git commit: # IGNITE-26 Replaced IgniteCheckedException with IgniteException on public API.
Date Tue, 16 Dec 2014 18:23:01 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
index 77cf114..c0564a8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
@@ -227,7 +227,7 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter {
                             try {
                                 desc = new TaskDescriptor(true, f.get(), null);
                             }
-                            catch (IgniteCheckedException e) {
+                            catch (IgniteException e) {
                                 if (e.hasCause(ClusterTopologyException.class, ClusterGroupEmptyException.class))
                                     U.warn(log, "Failed to execute task due to topology issues (are all mapped " +
                                         "nodes alive?) [name=" + name + ", clientId=" + req.clientId() +
@@ -405,7 +405,7 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter {
                 try {
                     res.result(ctx.config().getMarshaller().unmarshal(res.resultBytes(), null));
                 }
-                catch (IgniteCheckedException e) {
+                catch (IgniteException e) {
                     U.error(log, "Failed to unmarshal task result: " + res, e);
                 }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceNotFoundException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceNotFoundException.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceNotFoundException.java
index 0a7a688..8b66c79 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceNotFoundException.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceNotFoundException.java
@@ -14,7 +14,7 @@ import org.apache.ignite.*;
 /**
  * Exception thrown if service is not found.
  */
-public class GridServiceNotFoundException extends IgniteCheckedException {
+public class GridServiceNotFoundException extends IgniteException {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/main/java/org/gridgain/grid/util/future/GridEmbeddedFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/future/GridEmbeddedFuture.java b/modules/core/src/main/java/org/gridgain/grid/util/future/GridEmbeddedFuture.java
index 485d4bd..4a71684 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/future/GridEmbeddedFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/future/GridEmbeddedFuture.java
@@ -56,7 +56,7 @@ public class GridEmbeddedFuture<A, B> extends GridFutureAdapter<A> {
                 try {
                     onDone(c.apply(embedded.get(), null));
                 }
-                catch (IgniteCheckedException| RuntimeException e) {
+                catch (RuntimeException e) {
                     onDone(c.apply(null, e));
                 }
                 catch (Error e) {
@@ -118,7 +118,7 @@ public class GridEmbeddedFuture<A, B> extends GridFutureAdapter<A> {
                             catch (GridClosureException e) {
                                 onDone(e.unwrap());
                             }
-                            catch (IgniteCheckedException | RuntimeException e) {
+                            catch (RuntimeException e) {
                                 onDone(e);
                             }
                             catch (Error e) {
@@ -134,7 +134,7 @@ public class GridEmbeddedFuture<A, B> extends GridFutureAdapter<A> {
 
                     onDone(e.unwrap());
                 }
-                catch (IgniteCheckedException | RuntimeException e) {
+                catch (RuntimeException e) {
                     c.apply(null, e);
 
                     onDone(e);
@@ -187,7 +187,7 @@ public class GridEmbeddedFuture<A, B> extends GridFutureAdapter<A> {
 
                                 onDone(e.unwrap());
                             }
-                            catch (IgniteCheckedException | RuntimeException e) {
+                            catch (RuntimeException e) {
                                 c2.apply(null, e);
 
                                 onDone(e);
@@ -205,7 +205,7 @@ public class GridEmbeddedFuture<A, B> extends GridFutureAdapter<A> {
 
                     onDone(e.unwrap());
                 }
-                catch (IgniteCheckedException | RuntimeException e) {
+                catch (RuntimeException e) {
                     c1.apply(null, e);
 
                     onDone(e);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/main/java/org/gridgain/grid/util/gridify/GridifyArgumentBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/gridify/GridifyArgumentBuilder.java b/modules/core/src/main/java/org/gridgain/grid/util/gridify/GridifyArgumentBuilder.java
index 0bec52f..f935023 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/gridify/GridifyArgumentBuilder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/gridify/GridifyArgumentBuilder.java
@@ -144,9 +144,9 @@ public final class GridifyArgumentBuilder {
      * @param arg Task argument contains all necessary data for method invoke.
      * @param input Input collection used in job.
      * @return Argument for job.
-     * @throws IgniteCheckedException In case of error.
+     * @throws IgniteException In case of error.
      */
-    public GridifyArgument createJobArgument(GridifyRangeArgument arg, Collection<?> input) throws IgniteCheckedException {
+    public GridifyArgument createJobArgument(GridifyRangeArgument arg, Collection<?> input) throws IgniteException {
         GridifyArgumentAdapter res = new GridifyArgumentAdapter();
 
         res.setTarget(arg.getTarget());
@@ -169,7 +169,7 @@ public final class GridifyArgumentBuilder {
         Object paramValue = GridifyUtils.collectionToParameter(paramCls, input);
 
         if (paramValue == null)
-            throw new IgniteCheckedException("Failed to create job argument for type: " + paramCls.getName());
+            throw new IgniteException("Failed to create job argument for type: " + paramCls.getName());
 
         mtdArgs[arg.getParamIndex()] = paramValue;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/main/java/org/gridgain/grid/util/gridify/GridifyJobAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/gridify/GridifyJobAdapter.java b/modules/core/src/main/java/org/gridgain/grid/util/gridify/GridifyJobAdapter.java
index cbb3215..90a00c1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/gridify/GridifyJobAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/gridify/GridifyJobAdapter.java
@@ -70,7 +70,7 @@ public class GridifyJobAdapter extends ComputeJobAdapter {
                     mtd.setAccessible(true);
                 }
                 catch (SecurityException e) {
-                    throw new IgniteCheckedException("Got security exception when attempting to soften access control for " +
+                    throw new IgniteException("Got security exception when attempting to soften access control for " +
                         "@Gridify method: " + mtd, e);
                 }
 
@@ -84,16 +84,16 @@ public class GridifyJobAdapter extends ComputeJobAdapter {
             return mtd.invoke(obj, arg.getMethodParameters());
         }
         catch (InvocationTargetException e) {
-            if (e.getTargetException() instanceof IgniteCheckedException)
-                throw (IgniteCheckedException)e.getTargetException();
+            if (e.getTargetException() instanceof IgniteException)
+                throw (IgniteException)e.getTargetException();
 
-            throw new IgniteCheckedException("Failed to invoke a method due to user exception.", e.getTargetException());
+            throw new IgniteException("Failed to invoke a method due to user exception.", e.getTargetException());
         }
         catch (IllegalAccessException e) {
-            throw new IgniteCheckedException("Failed to access method for execution.", e);
+            throw new IgniteException("Failed to access method for execution.", e);
         }
         catch (NoSuchMethodException e) {
-            throw new IgniteCheckedException("Failed to find method for execution.", e);
+            throw new IgniteException("Failed to find method for execution.", e);
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/main/java/org/gridgain/grid/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/lang/GridFunc.java b/modules/core/src/main/java/org/gridgain/grid/util/lang/GridFunc.java
index 3b31ecf..1e16164 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/lang/GridFunc.java
@@ -2769,12 +2769,7 @@ public class GridFunc {
         return new GridSerializableFuture<T>() {
             @Override public boolean cancel(boolean mayInterruptIfRunning) {
                 if (mayInterruptIfRunning) {
-                    try {
-                        return fut.cancel();
-                    }
-                    catch (IgniteCheckedException e) {
-                        throw new IgniteException(e);
-                    }
+                    return fut.cancel();
                 }
                 else
                     return false;
@@ -2798,7 +2793,7 @@ public class GridFunc {
                 catch (GridInterruptedException ignore) {
                     throw new InterruptedException("The computation was interrupted.");
                 }
-                catch (IgniteCheckedException e) {
+                catch (IgniteException e) {
                     throw new ExecutionException("The computation failed.", e);
                 }
             }
@@ -2817,7 +2812,7 @@ public class GridFunc {
                 catch (IgniteFutureTimeoutException e) {
                     throw new TimeoutException("The computation timed out: " + e.getMessage());
                 }
-                catch (IgniteCheckedException e) {
+                catch (IgniteException e) {
                     throw new ExecutionException("The computation failed.", e);
                 }
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java b/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
index 3d79267..ec59801 100644
--- a/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
+++ b/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
@@ -41,7 +41,7 @@ public class GridJdbcUtils {
         try {
             return MARSHALLER.marshal(args);
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             throw new SQLException("Failed to unmarshal result.", e);
         }
     }
@@ -70,7 +70,7 @@ public class GridJdbcUtils {
         try {
             return MARSHALLER.unmarshal(bytes, null);
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             throw new SQLException("Failed to unmarshal result.", e);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
index 8583dc2..22b5b13 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
@@ -202,7 +202,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
 
             fail();
         }
-        catch (IgniteCheckedException ignore) {
+        catch (IgniteException ignore) {
             // No-op.
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
index c197283..2bfe01b 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
@@ -212,7 +212,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
 
             assert false : "Exception not thrown.";
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             NotSerializableException serEx = e.getCause(NotSerializableException.class);
 
             if (serEx == null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java
index 56eb74b..2d9fe03 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java
@@ -101,7 +101,7 @@ public class GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest extends
         try {
             getSpi().saveCheckpoint(CHECK_POINT_KEY_PREFIX, GridTestIoUtils.serializeJdk(state), 0, true);
         }
-        catch (IgniteCheckedException ignored) {
+        catch (IgniteException ignored) {
             error = true;
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
index 5031b2f..0c3da6b 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
@@ -265,7 +265,7 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest {
                     U.sleep(delayTime);
                 }
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 U.error(log, "Cannot process incoming message", e);
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
index 2e579d0..aec6818 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -192,7 +192,7 @@ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
         @Override protected Collection<? extends ComputeJob> split(int gridSize, Void arg) throws IgniteException {
             return Collections.singleton(new ComputeJobAdapter() {
                 @Nullable @Override public Object execute() throws IgniteException {
-                    throw new IgniteCheckedException("Task failed.");
+                    throw new IgniteException("Task failed.");
                 }
             });
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java
index ff15986..1f407ac 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java
@@ -168,7 +168,7 @@ public class GridTcpCommunicationSpiLanTest extends GridSpiAbstractTest<TcpCommu
                         spi.sendMessage(remoteNode, msg);
                     }
                 }
-                catch (IgniteCheckedException e) {
+                catch (IgniteException e) {
                     fail("Unable to send message: " + e.getMessage());
                 }
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
index 1889cd2..9b5330c 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
@@ -193,7 +193,7 @@ public abstract class GridTcpCommunicationSpiMultithreadedSelfTest extends GridS
                         queue.offer(msg);
                     }
                 }
-                catch (IgniteCheckedException e) {
+                catch (IgniteException e) {
                     log().error("Unable to send message.", e);
 
                     fail("Unable to send message: " + e.getMessage());
@@ -281,7 +281,7 @@ public abstract class GridTcpCommunicationSpiMultithreadedSelfTest extends GridS
                                 spis.get(from.id()).sendMessage(node, msg);
                             }
                         }
-                        catch (IgniteCheckedException e) {
+                        catch (IgniteException e) {
                             log.warning(">>> Oops, unable to send message (safe to ignore).", e);
                         }
 
@@ -378,7 +378,7 @@ public abstract class GridTcpCommunicationSpiMultithreadedSelfTest extends GridS
                         spi.sendMessage(to, msg);
                     }
                 }
-                catch (IgniteCheckedException e) {
+                catch (IgniteException e) {
                     fail("Unable to send message: " + e.getMessage());
                 }
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java
index cc8a5e0..67f745f 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java
@@ -115,7 +115,7 @@ public class GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest
         try {
             getSpi().getBalancedNode(ses, notInTop, new GridTestJob());
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             assertTrue(e.getMessage().contains("Task topology does not have alive nodes"));
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/apache/ignite/streamer/index/GridStreamerIndexSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/streamer/index/GridStreamerIndexSelfTest.java b/modules/core/src/test/java/org/apache/ignite/streamer/index/GridStreamerIndexSelfTest.java
index 060b6e4..1f2851d 100644
--- a/modules/core/src/test/java/org/apache/ignite/streamer/index/GridStreamerIndexSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/streamer/index/GridStreamerIndexSelfTest.java
@@ -86,7 +86,7 @@ public class GridStreamerIndexSelfTest extends GridCommonAbstractTest {
 
             fail("Exception should have been thrown.");
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             info("Caught expected exception: " + e);
         }
 
@@ -254,7 +254,7 @@ public class GridStreamerIndexSelfTest extends GridCommonAbstractTest {
                     try {
                         win.enqueue(evt);
                     }
-                    catch (IgniteCheckedException e) {
+                    catch (IgniteException e) {
                         if (e.getMessage().contains("Index unique key violation"))
                             nIdxErrors.incrementAndGet();
                         else
@@ -525,7 +525,7 @@ public class GridStreamerIndexSelfTest extends GridCommonAbstractTest {
 
                 fail("Exception should have been thrown.");
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 info("Caught expected exception: " + e);
             }
         }
@@ -670,7 +670,7 @@ public class GridStreamerIndexSelfTest extends GridCommonAbstractTest {
         /** {@inheritDoc} */
         @Nullable @Override public String onAdded(StreamerIndexEntry<String, String, String> entry, String evt)
             throws IgniteException {
-            throw new IgniteCheckedException("Unique key violation: " + evt);
+            throw new IgniteException("Unique key violation: " + evt);
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/GridTestJobResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/GridTestJobResult.java b/modules/core/src/test/java/org/gridgain/grid/GridTestJobResult.java
index 4f7563b..11f6576 100644
--- a/modules/core/src/test/java/org/gridgain/grid/GridTestJobResult.java
+++ b/modules/core/src/test/java/org/gridgain/grid/GridTestJobResult.java
@@ -23,7 +23,7 @@ public class GridTestJobResult implements ComputeJobResult {
     private final Serializable data;
 
     /** */
-    private final IgniteCheckedException e;
+    private final IgniteException e;
 
     /** */
     private final ComputeJob job;
@@ -50,7 +50,7 @@ public class GridTestJobResult implements ComputeJobResult {
      * @param node Grid node.
      * @param jobCtx Job context.
      */
-    public GridTestJobResult(Serializable data, IgniteCheckedException e, ComputeJob job, ClusterNode node, ComputeJobContext jobCtx) {
+    public GridTestJobResult(Serializable data, IgniteException e, ComputeJob job, ClusterNode node, ComputeJobContext jobCtx) {
         this.data = data;
         this.e = e;
         this.job = job;
@@ -72,7 +72,7 @@ public class GridTestJobResult implements ComputeJobResult {
 
     /** {@inheritDoc} */ @Override public Serializable getData() { return data; }
 
-    /** {@inheritDoc} */ @Override public IgniteCheckedException getException() { return e; }
+    /** {@inheritDoc} */ @Override public IgniteException getException() { return e; }
 
     /** {@inheritDoc} */ @Override public boolean isCancelled() { return false; }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java
index ada1195..5c83b4f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java
@@ -510,7 +510,7 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT
         try {
             ggfs.delete(dir.parent(), false); // Will generate no events.
         }
-        catch (IgniteCheckedException ignore) {
+        catch (IgniteException ignore) {
             // No-op.
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridAlwaysFailoverSpiFailSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAlwaysFailoverSpiFailSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAlwaysFailoverSpiFailSelfTest.java
index 8be4c9b..46effa1 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAlwaysFailoverSpiFailSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAlwaysFailoverSpiFailSelfTest.java
@@ -61,7 +61,7 @@ public class GridAlwaysFailoverSpiFailSelfTest extends GridCommonAbstractTest {
 
             assert false;
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             //No-op
         }
 
@@ -85,7 +85,7 @@ public class GridAlwaysFailoverSpiFailSelfTest extends GridCommonAbstractTest {
 
             assert false;
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             //No-op
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelOnGridStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelOnGridStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelOnGridStopSelfTest.java
index 860d4f8..9498d32 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelOnGridStopSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelOnGridStopSelfTest.java
@@ -80,7 +80,7 @@ public class GridCancelOnGridStopSelfTest extends GridCommonAbstractTest {
                                 Thread.sleep(Long.MAX_VALUE);
                             }
                             catch (InterruptedException e) {
-                                throw new IgniteCheckedException(e);
+                                throw new IgniteException(e);
                             }
 
                             return null;
@@ -89,7 +89,7 @@ public class GridCancelOnGridStopSelfTest extends GridCommonAbstractTest {
                 }
             }
 
-            throw new IgniteCheckedException("Local node not found");
+            throw new IgniteException("Local node not found");
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelledJobsMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelledJobsMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelledJobsMetricsSelfTest.java
index d4ab8fc..a7a6619 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelledJobsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelledJobsMetricsSelfTest.java
@@ -86,7 +86,7 @@ public class GridCancelledJobsMetricsSelfTest extends GridCommonAbstractTest {
 
                 assert false : "Job was not interrupted.";
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 if (e.hasCause(InterruptedException.class))
                     throw new IgniteCheckedException("Test run has been interrupted.", e);
 
@@ -133,10 +133,10 @@ public class GridCancelledJobsMetricsSelfTest extends GridCommonAbstractTest {
                     Thread.sleep(1000);
                 }
                 catch (InterruptedException e1) {
-                    throw new IgniteCheckedException("Unexpected exception: ", e1);
+                    throw new IgniteException("Unexpected exception: ", e1);
                 }
 
-                throw new IgniteCheckedException("Job got interrupted while waiting for cancellation.");
+                throw new IgniteException("Job got interrupted while waiting for cancellation.");
             }
             finally {
                 X.println("Finished job.");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridCommunicationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCommunicationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCommunicationSelfTest.java
index a8caced..e59f3f7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCommunicationSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCommunicationSelfTest.java
@@ -59,7 +59,7 @@ public class GridCommunicationSelfTest extends GridCommonAbstractTest {
             message(ignite.cluster().forNodes(nodes)).send(null,
                 new GridTestCommunicationMessage(cntr, ignite.cluster().localNode().id()));
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             error("Failed to send message.", e);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobAnnotationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobAnnotationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobAnnotationSelfTest.java
index 0f66aaf..14abe58 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobAnnotationSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobAnnotationSelfTest.java
@@ -102,7 +102,7 @@ public class GridContinuousJobAnnotationSelfTest extends GridCommonAbstractTest
                 mapper.send(((Class<ComputeJob>)arg).newInstance());
             }
             catch (Exception e) {
-                throw new IgniteCheckedException("Job instantination failed.", e);
+                throw new IgniteException("Job instantination failed.", e);
             }
 
             return null;
@@ -113,7 +113,7 @@ public class GridContinuousJobAnnotationSelfTest extends GridCommonAbstractTest
             throws IgniteException {
             if (res.getException() != null) {
                 if (res.getException() instanceof ComputeUserUndeclaredException)
-                    throw new IgniteCheckedException("Job threw unexpected exception.", res.getException());
+                    throw new IgniteException("Job threw unexpected exception.", res.getException());
 
                 return ComputeJobResultPolicy.FAILOVER;
             }
@@ -187,7 +187,7 @@ public class GridContinuousJobAnnotationSelfTest extends GridCommonAbstractTest
             if (fail.get()) {
                 fail.set(false);
 
-                throw new IgniteCheckedException("Expected test exception.");
+                throw new IgniteException("Expected test exception.");
             }
 
             return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobSiblingsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobSiblingsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobSiblingsSelfTest.java
index af09425..10528f4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobSiblingsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobSiblingsSelfTest.java
@@ -77,7 +77,7 @@ public class GridContinuousJobSiblingsSelfTest extends GridCommonAbstractTest {
         @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> received)
             throws IgniteException {
             if (res.getException() != null)
-                throw new IgniteCheckedException("Job resulted in error: " + res, res.getException());
+                throw new IgniteException("Job resulted in error: " + res, res.getException());
 
             assert ses.getJobSiblings().size() == jobCnt;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousTaskSelfTest.java
index 5b15269..85bc972 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousTaskSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousTaskSelfTest.java
@@ -81,7 +81,7 @@ public class GridContinuousTaskSelfTest extends GridCommonAbstractTest {
                         assert fut1.get() == 55;
                         assert fut2.get() == 55;
                     }
-                    catch (IgniteCheckedException e) {
+                    catch (IgniteException e) {
                         assert false : "Test task failed: " + e;
                     }
                 }
@@ -249,7 +249,7 @@ public class GridContinuousTaskSelfTest extends GridCommonAbstractTest {
                                 try {
                                     mapper.send(new SessionChainTestJob(cnt));
                                 }
-                                catch (IgniteCheckedException e) {
+                                catch (IgniteException e) {
                                     log.error("Failed to send new job.", e);
                                 }
                             }
@@ -325,7 +325,7 @@ public class GridContinuousTaskSelfTest extends GridCommonAbstractTest {
                 Thread.sleep(10000);
             }
             catch (InterruptedException e) {
-                throw new IgniteCheckedException("Job has been interrupted.", e);
+                throw new IgniteException("Job has been interrupted.", e);
             }
 
             mapper.send(new TestJob(++cnt));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentMultiThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentMultiThreadedSelfTest.java
index 0af0b2e..c2008df 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentMultiThreadedSelfTest.java
@@ -57,7 +57,7 @@ public class GridDeploymentMultiThreadedSelfTest extends GridCommonAbstractTest
                         if (++iterCnt % 100 == 0)
                             info("Iterations count: " + iterCnt);
                     }
-                    catch (IgniteCheckedException e) {
+                    catch (IgniteException e) {
                         U.error(log, "Failed to undeploy task message.", e);
 
                         fail("See logs for details.");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentSelfTest.java
index a986dae..998d424 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentSelfTest.java
@@ -217,7 +217,7 @@ public class GridDeploymentSelfTest extends GridCommonAbstractTest {
 
                 assert false : "Should not be able to deploy 2 task with same task name";
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 info("Received expected grid exception: " + e);
             }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridEventStorageCheckAllEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridEventStorageCheckAllEventsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridEventStorageCheckAllEventsSelfTest.java
index 8ae2215..592b812 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridEventStorageCheckAllEventsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridEventStorageCheckAllEventsSelfTest.java
@@ -154,7 +154,7 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe
 
             assert false : "Grid with locally executed job with timeout should throw GridComputeTaskTimeoutException.";
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             info("Expected exception caught [taskFuture=" + fut + ", exception=" + e + ']');
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridExplicitImplicitDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridExplicitImplicitDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridExplicitImplicitDeploymentSelfTest.java
index def4d0a..829ce7b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridExplicitImplicitDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridExplicitImplicitDeploymentSelfTest.java
@@ -14,7 +14,6 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.*;
@@ -460,7 +459,7 @@ public class GridExplicitImplicitDeploymentSelfTest extends GridCommonAbstractTe
                 return null;
             }
             catch (IOException e) {
-                throw new IgniteCheckedException("Failed to execute job.", e);
+                throw new IgniteException("Failed to execute job.", e);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
index 37aa005..da45c0a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFactoryVmShutdownTest.java
@@ -70,7 +70,7 @@ public class GridFactoryVmShutdownTest {
                 try {
                     G.start(cfg);
                 }
-                catch (IgniteCheckedException e) {
+                catch (IgniteException e) {
                     throw new IgniteException("Failed to start grid in shutdown hook.", e);
                 }
                 finally {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java
index 05bf11a..4ced278 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java
@@ -92,7 +92,7 @@ public class GridFailoverCustomTopologySelfTest extends GridCommonAbstractTest {
 
                 info("Task result: " + res);
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 info("Got unexpected grid exception: " + e);
             }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverSelfTest.java
index e52bae3..ae26a28 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverSelfTest.java
@@ -94,7 +94,7 @@ public class GridFailoverSelfTest extends GridCommonAbstractTest {
                         fail = ses.<String, Boolean>waitForAttribute("fail", 0);
                     }
                     catch (InterruptedException e) {
-                        throw new IgniteCheckedException("Got interrupted while waiting for attribute to be set.", e);
+                        throw new IgniteException("Got interrupted while waiting for attribute to be set.", e);
                     }
 
                     if (fail) {
@@ -102,7 +102,7 @@ public class GridFailoverSelfTest extends GridCommonAbstractTest {
 
                         assert nodeRef.get().id().equals(locId);
 
-                        throw new IgniteCheckedException("Job exception.");
+                        throw new IgniteException("Job exception.");
                     }
 
                     assert !nodeRef.get().id().equals(locId);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java
index 27c3cd5..c44a4c3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java
@@ -204,13 +204,13 @@ public class GridFailoverTaskWithPredicateSelfTest extends GridCommonAbstractTes
                         fail = ses.<String, Boolean>waitForAttribute("fail", 0);
                     }
                     catch (InterruptedException e) {
-                        throw new IgniteCheckedException("Got interrupted while waiting for attribute to be set.", e);
+                        throw new IgniteException("Got interrupted while waiting for attribute to be set.", e);
                     }
 
                     if (fail) {
                         ses.setAttribute("fail", false);
 
-                        throw new IgniteCheckedException("Job exception.");
+                        throw new IgniteException("Job exception.");
                     }
 
                     // This job does not return any result.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTopologySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTopologySelfTest.java
index eb7b69c..5803b2f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTopologySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTopologySelfTest.java
@@ -87,7 +87,7 @@ public class GridFailoverTopologySelfTest extends GridCommonAbstractTest {
             try {
                 compute(ignite1.cluster().forRemotes()).execute(JobFailTask.class, null);
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 info("Got expected grid exception: " + e);
             }
 
@@ -121,7 +121,7 @@ public class GridFailoverTopologySelfTest extends GridCommonAbstractTest {
 
             return Collections.singletonMap(new ComputeJobAdapter(arg) {
                 @Override public Serializable execute() throws IgniteException {
-                    throw new IgniteCheckedException("Job exception.");
+                    throw new IgniteException("Job exception.");
                 }
             }, remoteNode);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
index f5db8d6..3f306a3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
@@ -517,7 +517,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
         try {
             fut.get();
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             log.debug("Task failed: " + e);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
index b68536c..8aa9735 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
@@ -420,7 +420,7 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest {
             catch (InterruptedException e) {
                 log.info("Job got interrupted on node: " + ignite.cluster().localNode().id());
 
-                throw new IgniteCheckedException("Job got interrupted.", e);
+                throw new IgniteException("Job got interrupted.", e);
             }
             finally {
                 log.info("Job finished on node: " + ignite.cluster().localNode().id());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
index d04fffc..d5a6ad8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
@@ -153,7 +153,7 @@ public class GridJobStealingZeroActiveJobsSelfTest extends GridCommonAbstractTes
                 Thread.sleep(sleep);
             }
             catch (InterruptedException e) {
-                throw new IgniteCheckedException("Job got interrupted.", e);
+                throw new IgniteException("Job got interrupted.", e);
             }
 
             return ignite.name();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java
index 889a747..27c3ae2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java
@@ -278,7 +278,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
         @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteException {
             if (evt == errType) {
                 if (gridErr)
-                    throw new IgniteCheckedException("Expected exception for event: " + evt) {
+                    throw new IgniteException("Expected exception for event: " + evt) {
                         @Override public void printStackTrace(PrintStream s) {
                             // No-op.
                         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java
index 53f13b8..abe1dbe 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java
@@ -13,6 +13,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.messaging.*;
 import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java
index fff71c3..1bbe55a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java
@@ -104,7 +104,7 @@ public class GridMultipleSpisSelfTest extends GridCommonAbstractTest {
             try {
                 ignite1.compute().execute(GridTestMultipleSpisTask.class.getName(), ignite1.cluster().localNode().id());
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 e.printStackTrace();
 
                 assert false : "Unexpected exception.";
@@ -284,7 +284,7 @@ public class GridMultipleSpisSelfTest extends GridCommonAbstractTest {
 
             // Should always fail on task originating node and work on another one.
             if (locId.equals(argument(0)))
-                throw new IgniteCheckedException("Expected exception to failover job.");
+                throw new IgniteException("Expected exception to failover job.");
 
             // Use checkpoint on job side. This will happen on remote node.
             jobSes.loadCheckpoint("test");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
index 879dde3..c69b6ae 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
@@ -286,7 +286,7 @@ public class GridMultipleVersionsDeploymentSelfTest extends GridCommonAbstractTe
                 return res - 48;
             }
             catch (IOException | InterruptedException e) {
-                throw new IgniteCheckedException("Failed to execute job.", e);
+                throw new IgniteException("Failed to execute job.", e);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
index ff74770..4a0a683 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
@@ -91,7 +91,7 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest
                         }
                     }
                 }
-                catch (IgniteCheckedException e) {
+                catch (IgniteException e) {
                     log.error("Failed to execute task.", e);
 
                     fail.getAndSet(e);
@@ -210,7 +210,7 @@ public class GridMultithreadedJobStealingSelfTest extends GridCommonAbstractTest
                 Thread.sleep(sleep);
             }
             catch (InterruptedException e) {
-                throw new IgniteCheckedException("Job got interrupted.", e);
+                throw new IgniteException("Job got interrupted.", e);
             }
 
             return ignite.name();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
index c114840..b12db3a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
@@ -76,7 +76,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
 
             assert false;
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             info("Got expected grid exception: " + e);
         }
 
@@ -106,7 +106,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
 
             assert false;
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             info("Got expected grid exception: " + e);
         }
 
@@ -136,7 +136,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
 
             assert false;
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             info("Got expected grid exception: " + e);
         }
 
@@ -166,7 +166,7 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
 
             assert false;
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             info("Got expected grid exception: " + e);
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java
index 815e59c..bcb5126 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridSpiExceptionSelfTest.java
@@ -70,7 +70,7 @@ public class GridSpiExceptionSelfTest extends GridCommonAbstractTest {
 
                 assert false : "Exception should be thrown";
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 assert e.getCause() instanceof GridTestSpiException : "Wrong cause exception type. " + e;
 
                 assert e.getCause().getMessage().startsWith(TEST_MSG) : "Wrong exception message." + e.getMessage();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java
index bbe995e..49996df 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java
@@ -95,7 +95,7 @@ public class GridStopWithCancelSelfTest extends GridCommonAbstractTest {
                                 Thread.sleep(Long.MAX_VALUE);
                             }
                             catch (InterruptedException e) {
-                                throw new IgniteCheckedException(e);
+                                throw new IgniteException(e);
                             }
 
                             return null;
@@ -104,7 +104,7 @@ public class GridStopWithCancelSelfTest extends GridCommonAbstractTest {
                 }
             }
 
-            throw new IgniteCheckedException("Local node not found");
+            throw new IgniteException("Local node not found");
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
index 4ba0c82..ba8621f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
@@ -194,7 +194,7 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest {
                         fail = ses.waitForAttribute("fail", 0);
                     }
                     catch (InterruptedException e) {
-                        throw new IgniteCheckedException("Got interrupted while waiting for attribute to be set.", e);
+                        throw new IgniteException("Got interrupted while waiting for attribute to be set.", e);
                     }
 
                     log.info("Failed attribute: " + fail);
@@ -207,7 +207,7 @@ public class GridStopWithWaitSelfTest extends GridCommonAbstractTest {
 
                         log.info("Throwing grid exception from job.");
 
-                        throw new IgniteCheckedException("Job exception.");
+                        throw new IgniteException("Job exception.");
                     }
 
                     assert !nodeRef.get().id().equals(locId);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
index 5c6c7dd..d7ed2e6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
@@ -164,7 +164,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
 
                 assert false;
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 if (log.isInfoEnabled())
                     log.info("Expected exception: " + e);
             }
@@ -174,7 +174,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
 
                 assert false;
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 if (log.isInfoEnabled())
                     log.info("Expected exception: " + e);
             }
@@ -184,7 +184,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
 
                 assert false;
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 if (log.isInfoEnabled())
                     log.info("Expected exception: " + e);
             }
@@ -194,7 +194,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
 
                 assert false;
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 if (log.isInfoEnabled())
                     log.info("Expected exception: " + e);
             }
@@ -253,7 +253,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
 
                 assert false;
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 if (log.isInfoEnabled())
                     log.info("Expected exception: " + e);
             }
@@ -283,7 +283,7 @@ public class GridTaskContinuousMapperSelfTest extends GridCommonAbstractTest {
 
                 assert false;
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 if (log.isInfoEnabled())
                     log.info("Expected exception: " + e);
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java
index df76582..7600d20 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java
@@ -69,7 +69,7 @@ public class GridTaskInstantiationSelfTest extends GridCommonAbstractTest {
                         }
                     }, node);
 
-            throw new IgniteCheckedException("Local node not found.");
+            throw new IgniteException("Local node not found.");
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
index 566a201..90f2cb8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
@@ -365,7 +365,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                 Thread.sleep(6000);
             }
             catch (InterruptedException e) {
-                throw new IgniteCheckedException(e);
+                throw new IgniteException(e);
             }
 
             assertWithRetries(new GridAbsClosureX() {
@@ -433,7 +433,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                 startLatch.await();
             }
             catch (InterruptedException e) {
-                throw new IgniteCheckedException("Thread has been interrupted.", e);
+                throw new IgniteException("Thread has been interrupted.", e);
             }
 
             X.println(">>> Producer started.");
@@ -447,7 +447,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                 read1FinishedLatch.await();
             }
             catch (InterruptedException e) {
-                throw new IgniteCheckedException("Thread has been interrupted.", e);
+                throw new IgniteException("Thread has been interrupted.", e);
             }
 
             // No retries here as other thread should have seen checkpoint already.
@@ -463,7 +463,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                 read2FinishedLatch.await();
             }
             catch (InterruptedException e) {
-                throw new IgniteCheckedException("Thread has been interrupted.", e);
+                throw new IgniteException("Thread has been interrupted.", e);
             }
 
             assert GLOBAL_VAL.equals(taskSes.loadCheckpoint(GLOBAL_KEY));
@@ -479,7 +479,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                 read3FinishedLatch.await();
             }
             catch (InterruptedException e) {
-                throw new IgniteCheckedException("Thread has been interrupted.", e);
+                throw new IgniteException("Thread has been interrupted.", e);
             }
 
             assert SES_VAL_OVERWRITTEN.equals(taskSes.loadCheckpoint(GLOBAL_KEY));
@@ -536,7 +536,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                 startLatch.await();
             }
             catch (InterruptedException e) {
-                throw new IgniteCheckedException("Thread has been interrupted.", e);
+                throw new IgniteException("Thread has been interrupted.", e);
             }
 
             X.println(">>> Consumer started.");
@@ -545,7 +545,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                 read1Latch.await();
             }
             catch (InterruptedException e) {
-                throw new IgniteCheckedException("Thread has been interrupted.", e);
+                throw new IgniteException("Thread has been interrupted.", e);
             }
 
             // Test that checkpoints were saved properly.
@@ -562,7 +562,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                 read2Latch.await();
             }
             catch (InterruptedException e) {
-                throw new IgniteCheckedException("Thread has been interrupted.", e);
+                throw new IgniteException("Thread has been interrupted.", e);
             }
 
             // Test that checkpoints were not overwritten.
@@ -579,7 +579,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                 read3Latch.await();
             }
             catch (InterruptedException e) {
-                throw new IgniteCheckedException("Thread has been interrupted.", e);
+                throw new IgniteException("Thread has been interrupted.", e);
             }
 
             assertWithRetries(new GridAbsClosureX() {
@@ -595,7 +595,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                 rmvLatch.await();
             }
             catch (InterruptedException e) {
-                throw new IgniteCheckedException("Thread has been interrupted.", e);
+                throw new IgniteException("Thread has been interrupted.", e);
             }
             // Check checkpoints are actually removed.
             assert !taskSes.removeCheckpoint(GLOBAL_KEY);
@@ -664,7 +664,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                         startLatch.await();
                     }
                     catch (InterruptedException e) {
-                        throw new IgniteCheckedException("Thread has been interrupted.", e);
+                        throw new IgniteException("Thread has been interrupted.", e);
                     }
 
                     X.println(">>> Global consumer started.");
@@ -673,7 +673,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                         read1Latch.await();
                     }
                     catch (InterruptedException e) {
-                        throw new IgniteCheckedException("Thread has been interrupted.", e);
+                        throw new IgniteException("Thread has been interrupted.", e);
                     }
 
                     // Test that checkpoints were saved properly.
@@ -686,7 +686,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                         read2Latch.await();
                     }
                     catch (InterruptedException e) {
-                        throw new IgniteCheckedException("Thread has been interrupted.", e);
+                        throw new IgniteException("Thread has been interrupted.", e);
                     }
 
                     // Test that checkpoints were not overwritten.
@@ -699,7 +699,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                         read3Latch.await();
                     }
                     catch (InterruptedException e) {
-                        throw new IgniteCheckedException("Thread has been interrupted.", e);
+                        throw new IgniteException("Thread has been interrupted.", e);
                     }
 
                     assert GLOBAL_VAL_OVERWRITTEN.equals(taskSes.loadCheckpoint(SES_KEY));
@@ -711,7 +711,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
                         rmvLatch.await();
                     }
                     catch (InterruptedException e) {
-                        throw new IgniteCheckedException("Thread has been interrupted.", e);
+                        throw new IgniteException("Thread has been interrupted.", e);
                     }
                     // Check checkpoints are actually removed.
                     assert !taskSes.removeCheckpoint(GLOBAL_KEY);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
index e8737af..b55985e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
@@ -100,7 +100,7 @@ public class GridCommunicationManagerListenersSelfTest extends GridCommonAbstrac
             try {
                 G.ignite(getTestGridName()).compute().execute(t.getClass(), null);
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 assert false : "Failed to execute task [iteration=" + i + ", err=" + e.getMessage() + ']';
             }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index db3b76d..8bbd797 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -3244,7 +3244,12 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
             assert !forLocal(dfltIgnite).call(new Callable<Boolean>() {
                 @Override public Boolean call() throws IgniteException {
-                    return cache().lock("key", 100);
+                    try {
+                        return cache().lock("key", 100);
+                    }
+                    catch (IgniteCheckedException e) {
+                        throw U.wrap(e);
+                    }
                 }
             });
 
@@ -3272,7 +3277,12 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
             assert !forLocal(dfltIgnite).call(new Callable<Boolean>() {
                 @Override public Boolean call() throws IgniteException {
-                    return e.lock(100);
+                    try {
+                        return e.lock(100);
+                    }
+                    catch (IgniteCheckedException e1) {
+                        throw U.wrap(e1);
+                    }
                 }
             });
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
index d49d0fe..efdc396 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
@@ -226,7 +226,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest {
 
             fail();
         }
-        catch (IgniteCheckedException e) {
+        catch (IgniteException e) {
             info("Caught expected exception: " + e);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index 1cd917c..dc845a4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@ -327,7 +327,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
 
                     latency.addAndGet(t1 - t0);
                 }
-                catch (IgniteCheckedException e) {
+                catch (IgniteException e) {
                     e.printStackTrace();
                 }
             }
@@ -681,7 +681,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
 
                 return entry.getValue();
             }
-            catch (IgniteCheckedException e) {
+            catch (IgniteException e) {
                 e.printStackTrace();
 
                 return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java
index c812755..24acbd9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java
@@ -328,7 +328,7 @@ public class GridCacheGroupLockFailoverSelfTest extends GridCommonAbstractTest {
                 try {
                     f.get(); //if something went wrong - we'll get exception here
                 }
-                catch (IgniteCheckedException ignore) {
+                catch (IgniteException ignore) {
                     info("Put task failed, going to remap keys: " + dataChunk.size());
 
                     fail = true;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java
index 718205b..013f039 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java
@@ -17,6 +17,7 @@ import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
@@ -97,12 +98,17 @@ class GridCacheGroupLockPutTask extends ComputeTaskAdapter<Collection<Integer>,
                         Object affKey = pair.get1();
 
                         // Group lock partition.
-                        try (GridCacheTx tx = cache.txStartPartition(cache.affinity().partition(affKey),
-                            optimistic ? OPTIMISTIC : PESSIMISTIC, REPEATABLE_READ, 0, pair.get2().size())) {
-                            for (Integer val : pair.get2())
-                                cache.put(val, val);
-
-                            tx.commit();
+                        try {
+                            try (GridCacheTx tx = cache.txStartPartition(cache.affinity().partition(affKey),
+                                optimistic ? OPTIMISTIC : PESSIMISTIC, REPEATABLE_READ, 0, pair.get2().size())) {
+                                for (Integer val : pair.get2())
+                                    cache.put(val, val);
+
+                                tx.commit();
+                            }
+                        }
+                        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/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java
index 7998316..03dd609 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java
@@ -249,7 +249,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
                             try {
                                 taskFut.get(); //if something went wrong - we'll get exception here
                             }
-                            catch (IgniteCheckedException e) {
+                            catch (IgniteException e) {
                                 log.error("Job failed", e);
 
                                 jobFailed.set(true);
@@ -421,7 +421,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
                             try {
                                 taskFut.get(); //if something went wrong - we'll get exception here
                             }
-                            catch (IgniteCheckedException e) {
+                            catch (IgniteException e) {
                                 log.error("Job failed", e);
 
                                 jobFailed.set(true);
@@ -472,7 +472,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
                         try {
                             taskFut.get(); //if something went wrong - we'll get exception here
                         }
-                        catch (IgniteCheckedException e) {
+                        catch (IgniteException e) {
                             log.error("Job failed", e);
 
                             jobFailed.set(true);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStopSelfTest.java
index 3402297..ae5e63a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStopSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStopSelfTest.java
@@ -170,7 +170,7 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest {
                 try {
                     fut.get();
                 }
-                catch (IgniteCheckedException e) {
+                catch (IgniteException e) {
                     if (!e.getMessage().startsWith(EXPECTED_MSG))
                         e.printStackTrace();
 


Mime
View raw message