http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java index 863c2c7..8146521 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java @@ -145,10 +145,10 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac * @param ignite Grid. * @param itemKey Item key. * @param retry Retry count. - * @throws IgniteCheckedException If failed. + * @throws IgniteException If failed. */ @SuppressWarnings("unchecked") - private void onItemNear(boolean putCntr, Ignite ignite, String itemKey, int retry) throws IgniteCheckedException { + private void onItemNear(boolean putCntr, Ignite ignite, String itemKey, int retry) throws IgniteException { GridCache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); @@ -157,37 +157,42 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac boolean isCntrPrimary = cntrPrimaryId.equals(locId); - try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { - if (DEBUG) - info("Before near get [retry=" + retry + ", xid=" + tx.xid() + ", node=" + ignite.name() + - ", isCntrPrimary=" + isCntrPrimary + ", nearId=" + locId + - ", nearEntry=" + nearEntry(locId, CNTR_KEY) + - (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, CNTR_KEY) : "") + ']'); + try { + try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { + if (DEBUG) + info("Before near get [retry=" + retry + ", xid=" + tx.xid() + ", node=" + ignite.name() + + ", isCntrPrimary=" + isCntrPrimary + ", nearId=" + locId + + ", nearEntry=" + nearEntry(locId, CNTR_KEY) + + (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, CNTR_KEY) : "") + ']'); - Integer cntr = cache.get(CNTR_KEY); + Integer cntr = cache.get(CNTR_KEY); - int newVal = cntr + 1; + int newVal = cntr + 1; - if (putCntr) { - if (DEBUG) - info("Before near put counter [retry=" + retry + ", isCntrPrimary=" + isCntrPrimary + - ", cur=" + cntr + ", new=" + newVal + ", nearEntry=" + nearEntry(locId, CNTR_KEY) + - (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, CNTR_KEY) : "") + ']'); + if (putCntr) { + if (DEBUG) + info("Before near put counter [retry=" + retry + ", isCntrPrimary=" + isCntrPrimary + + ", cur=" + cntr + ", new=" + newVal + ", nearEntry=" + nearEntry(locId, CNTR_KEY) + + (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, CNTR_KEY) : "") + ']'); - cache.putx(CNTR_KEY, newVal); - } + cache.putx(CNTR_KEY, newVal); + } - if (DEBUG) - info("Before near put item [retry=" + retry + ", key=" + itemKey + ", cur=" + cntr + ", new=" + newVal + - ", nearEntry=" + nearEntry(locId, itemKey) + ", dhtEntry=" + dhtEntry(itemPrimaryId, itemKey) + ']'); + if (DEBUG) + info("Before near put item [retry=" + retry + ", key=" + itemKey + ", cur=" + cntr + ", new=" + newVal + + ", nearEntry=" + nearEntry(locId, itemKey) + ", dhtEntry=" + dhtEntry(itemPrimaryId, itemKey) + ']'); - cache.putx(itemKey, newVal); + cache.putx(itemKey, newVal); - if (DEBUG) - info("After near put item [retry=" + retry + ", key=" + itemKey + ", old=" + cntr + ", new=" + newVal + - ", nearEntry=" + nearEntry(locId, itemKey) + ", dhtEntry" + dhtEntry(itemPrimaryId, itemKey) + ']'); + if (DEBUG) + info("After near put item [retry=" + retry + ", key=" + itemKey + ", old=" + cntr + ", new=" + newVal + + ", nearEntry=" + nearEntry(locId, itemKey) + ", dhtEntry" + dhtEntry(itemPrimaryId, itemKey) + ']'); - tx.commit(); + tx.commit(); + } + } + catch (IgniteCheckedException e) { + throw U.wrap(e); } } @@ -200,7 +205,7 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac * @throws IgniteCheckedException If failed. */ @SuppressWarnings("unchecked") - private void onItemPrimary(boolean putCntr, Ignite ignite, String itemKey, int retry) throws IgniteCheckedException { + private void onItemPrimary(boolean putCntr, Ignite ignite, String itemKey, int retry) throws IgniteException { GridCache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); @@ -209,39 +214,44 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac boolean isCntrPrimary = cntrPrimaryId.equals(locId); - try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { - if (DEBUG) - info("Before item primary get [retry=" + retry + ", xid=" + tx.xid() + ", node=" + ignite.name() + - ", isCntrPrimary=" + isCntrPrimary + ", nearId=" + locId + - ", nearEntry=" + nearEntry(locId, CNTR_KEY) + - (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, CNTR_KEY) : "") + ']'); + try { + try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { + if (DEBUG) + info("Before item primary get [retry=" + retry + ", xid=" + tx.xid() + ", node=" + ignite.name() + + ", isCntrPrimary=" + isCntrPrimary + ", nearId=" + locId + + ", nearEntry=" + nearEntry(locId, CNTR_KEY) + + (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, CNTR_KEY) : "") + ']'); - Integer cntr = cache.get(CNTR_KEY); + Integer cntr = cache.get(CNTR_KEY); - int newVal = cntr + 1; + int newVal = cntr + 1; - if (putCntr) { - if (DEBUG) - info("Before item primary put counter [retry=" + retry + ", isCntrPrimary=" + isCntrPrimary + - ", cur=" + cntr + ", new=" + newVal + ", nearEntry=" + nearEntry(locId, CNTR_KEY) + - (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, CNTR_KEY) : "") + ']'); + if (putCntr) { + if (DEBUG) + info("Before item primary put counter [retry=" + retry + ", isCntrPrimary=" + isCntrPrimary + + ", cur=" + cntr + ", new=" + newVal + ", nearEntry=" + nearEntry(locId, CNTR_KEY) + + (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, CNTR_KEY) : "") + ']'); - cache.putx(CNTR_KEY, newVal); - } + cache.putx(CNTR_KEY, newVal); + } - if (DEBUG) - info("Before item primary put item [retry=" + retry + ", key=" + itemKey + ", cur=" + cntr + - ", new=" + newVal + ", nearEntry=" + nearEntry(locId, itemKey) + - ", dhtEntry=" + dhtEntry(itemPrimaryId, itemKey) + ']'); + if (DEBUG) + info("Before item primary put item [retry=" + retry + ", key=" + itemKey + ", cur=" + cntr + + ", new=" + newVal + ", nearEntry=" + nearEntry(locId, itemKey) + + ", dhtEntry=" + dhtEntry(itemPrimaryId, itemKey) + ']'); - cache.putx(itemKey, cntr); + cache.putx(itemKey, cntr); - if (DEBUG) - info("After item primary put item [retry=" + retry + ", key=" + itemKey + ", cur=" + cntr + - ", new=" + newVal + ", nearEntry=" + nearEntry(locId, itemKey) + - ", dhtEntry=" + dhtEntry(itemPrimaryId, itemKey) + ']'); + if (DEBUG) + info("After item primary put item [retry=" + retry + ", key=" + itemKey + ", cur=" + cntr + + ", new=" + newVal + ", nearEntry=" + nearEntry(locId, itemKey) + + ", dhtEntry=" + dhtEntry(itemPrimaryId, itemKey) + ']'); - tx.commit(); + tx.commit(); + } + } + catch (IgniteCheckedException e) { + throw U.wrap(e); } } @@ -250,10 +260,10 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac * @param putCntr Put counter to cache. * @param ignite Grid. * @param retry Retry count. - * @throws IgniteCheckedException If failed. + * @throws IgniteException If failed. */ @SuppressWarnings("unchecked") - private void onRemoveItemQueried(boolean putCntr, Ignite ignite, int retry) throws IgniteCheckedException { + private void onRemoveItemQueried(boolean putCntr, Ignite ignite, int retry) throws IgniteException { GridCache<String, Integer> cache = ignite.cache(null); UUID locId = ignite.cluster().localNode().id(); @@ -261,77 +271,82 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac boolean isCntrPrimary = cntrPrimaryId.equals(locId); - try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { - if (DEBUG) - ignite.log().info("Before item lock [retry=" + retry + ", xid=" + tx.xid() + ", node=" + ignite.name() + - ", isCntrPrimary=" + isCntrPrimary + ", nearId=" + locId + - ", nearEntry=" + nearEntry(locId, RMVD_CNTR_KEY) + - (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, RMVD_CNTR_KEY) : "") + ']'); + try { + try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { + if (DEBUG) + ignite.log().info("Before item lock [retry=" + retry + ", xid=" + tx.xid() + ", node=" + ignite.name() + + ", isCntrPrimary=" + isCntrPrimary + ", nearId=" + locId + + ", nearEntry=" + nearEntry(locId, RMVD_CNTR_KEY) + + (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, RMVD_CNTR_KEY) : "") + ']'); - Integer cntr = cache.get(RMVD_CNTR_KEY); + Integer cntr = cache.get(RMVD_CNTR_KEY); - assert cntr != null : "Received null counter [retry=" + retry + ", isCntrPrimary=" + isCntrPrimary + - ", nearEntry=" + nearEntry(locId, RMVD_CNTR_KEY) + - (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, RMVD_CNTR_KEY) : "") + ']'; + assert cntr != null : "Received null counter [retry=" + retry + ", isCntrPrimary=" + isCntrPrimary + + ", nearEntry=" + nearEntry(locId, RMVD_CNTR_KEY) + + (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, RMVD_CNTR_KEY) : "") + ']'; - int newVal = cntr - 1; + int newVal = cntr - 1; - if (putCntr) { - if (DEBUG) - ignite.log().info("Before item put counter [retry=" + retry + ", isCntrPrimary=" + isCntrPrimary + - ", cur=" + cntr + ", new=" + newVal + ", nearEntry=" + nearEntry(locId, RMVD_CNTR_KEY) + - (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, RMVD_CNTR_KEY) : "") + ']'); + if (putCntr) { + if (DEBUG) + ignite.log().info("Before item put counter [retry=" + retry + ", isCntrPrimary=" + isCntrPrimary + + ", cur=" + cntr + ", new=" + newVal + ", nearEntry=" + nearEntry(locId, RMVD_CNTR_KEY) + + (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, RMVD_CNTR_KEY) : "") + ']'); - cache.putx(RMVD_CNTR_KEY, newVal); - } + cache.putx(RMVD_CNTR_KEY, newVal); + } - while (true) { - GridCacheQuery<Map.Entry<String, Integer>> qry = - cache.queries().createSqlQuery(Integer.class, "_key != 'RMVD_CNTR_KEY' and _val >= 0"); + while (true) { + GridCacheQuery<Map.Entry<String, Integer>> qry = + cache.queries().createSqlQuery(Integer.class, "_key != 'RMVD_CNTR_KEY' and _val >= 0"); - if (DEBUG) - ignite.log().info("Before executing query [retry=" + retry + ", locId=" + locId + - ", txId=" + tx.xid() + ']'); + if (DEBUG) + ignite.log().info("Before executing query [retry=" + retry + ", locId=" + locId + + ", txId=" + tx.xid() + ']'); - Map.Entry<String, Integer> entry = qry.execute().next(); + Map.Entry<String, Integer> entry = qry.execute().next(); - if (entry == null) { - ignite.log().info("*** Queue is empty."); + if (entry == null) { + ignite.log().info("*** Queue is empty."); - return; - } + return; + } - String itemKey = entry.getKey(); + String itemKey = entry.getKey(); - UUID itemPrimaryId = primaryId(ignite, itemKey); + UUID itemPrimaryId = primaryId(ignite, itemKey); - // Lock the item key. - if (cache.get(itemKey) != null) { - if (DEBUG) - ignite.log().info("Before item remove [retry=" + retry + ", key=" + itemKey + ", cur=" + cntr + - ", nearEntry=" + nearEntry(locId, itemKey) + - ", dhtEntry=" + dhtEntry(itemPrimaryId, itemKey) + ']'); + // Lock the item key. + if (cache.get(itemKey) != null) { + if (DEBUG) + ignite.log().info("Before item remove [retry=" + retry + ", key=" + itemKey + ", cur=" + cntr + + ", nearEntry=" + nearEntry(locId, itemKey) + + ", dhtEntry=" + dhtEntry(itemPrimaryId, itemKey) + ']'); - assert cache.removex(itemKey) : "Failed to remove key [locId=" + locId + - ", primaryId=" + itemPrimaryId + ", key=" + itemKey + ']'; + assert cache.removex(itemKey) : "Failed to remove key [locId=" + locId + + ", primaryId=" + itemPrimaryId + ", key=" + itemKey + ']'; - if (DEBUG) - info("After item remove item [retry=" + retry + ", key=" + itemKey + ", cur=" + cntr + - ", new=" + newVal + ", nearEntry=" + nearEntry(locId, itemKey) + - ", dhtEntry=" + dhtEntry(itemPrimaryId, itemKey) + ']'); + if (DEBUG) + info("After item remove item [retry=" + retry + ", key=" + itemKey + ", cur=" + cntr + + ", new=" + newVal + ", nearEntry=" + nearEntry(locId, itemKey) + + ", dhtEntry=" + dhtEntry(itemPrimaryId, itemKey) + ']'); - break; + break; + } + else + cache.removex(itemKey); } - else - cache.removex(itemKey); + + tx.commit(); } + catch (Error e) { + ignite.log().error("Error in test.", e); - tx.commit(); + throw e; + } } - catch (Error e) { - ignite.log().error("Error in test.", e); - - throw e; + catch (IgniteCheckedException e) { + throw U.wrap(e); } } @@ -410,7 +425,7 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac * @param ignite Grid. * @throws IgniteCheckedException If failed. */ - private void retries(Ignite ignite, boolean putCntr) throws IgniteCheckedException { + private void retries(Ignite ignite, boolean putCntr) throws IgniteException { UUID nodeId = ignite.cluster().localNode().id(); for (int i = 0; i < RETRIES; i++) { @@ -436,9 +451,9 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac * * @param putCntr Put counter to cache. * @param ignite Grid. - * @throws IgniteCheckedException If failed. + * @throws IgniteException If failed. */ - private void removeRetriesQueried(Ignite ignite, boolean putCntr) throws IgniteCheckedException { + private void removeRetriesQueried(Ignite ignite, boolean putCntr) throws IgniteException { for (int i = 0; i < RETRIES; i++) { if (DEBUG) ignite.log().info("***"); @@ -542,12 +557,7 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac threads.add(new Thread("thread-#" + i) { @Override public void run() { - try { - retries(grid(gridId), false); - } - catch (IgniteCheckedException e) { - throw new IgniteException(e); - } + retries(grid(gridId), false); } }); } @@ -585,12 +595,7 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac threads.add(new Thread() { @Override public void run() { - try { - retries(grid(gridId), true); - } - catch (IgniteCheckedException e) { - throw new IgniteException(e); - } + retries(grid(gridId), true); } }); } @@ -770,12 +775,7 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac threads.add(new Thread() { @Override public void run() { - try { - removeRetriesQueried(grid(gridId), true); - } - catch (IgniteCheckedException e) { - throw new IgniteException(e); - } + removeRetriesQueried(grid(gridId), true); } }); } @@ -905,7 +905,12 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - removeRetriesSimple(ignite, true); + try { + removeRetriesSimple(ignite, true); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } return 0; }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java index 9badb83..e2228fa 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java @@ -12,12 +12,12 @@ package org.gridgain.grid.kernal.processors.cache.datastructures; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.datastructures.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.util.typedef.*; +import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; import java.util.*; @@ -90,11 +90,16 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid // Execute task on all grid nodes. ignite.compute().call(new IgniteCallable<Object>() { @Override public String call() throws IgniteException { - GridCacheAtomicReference<String> ref = ignite.cache(null).dataStructures().atomicReference(refName, val, true); + try { + GridCacheAtomicReference<String> ref = ignite.cache(null).dataStructures().atomicReference(refName, val, true); - assertEquals(val, ref.get()); + assertEquals(val, ref.get()); - return ref.get(); + return ref.get(); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } }); @@ -103,11 +108,16 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid // Execute task on all grid nodes. ignite.compute().call(new IgniteCallable<String>() { @Override public String call() throws IgniteException { - GridCacheAtomicReference<String> ref = ignite.cache(null).dataStructures().atomicReference(refName, val, true); + try { + GridCacheAtomicReference<String> ref = ignite.cache(null).dataStructures().atomicReference(refName, val, true); - assertEquals(val, ref.get()); + assertEquals(val, ref.get()); - return ref.get(); + return ref.get(); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } }); @@ -116,11 +126,16 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid // Execute task on all grid nodes. ignite.compute().call(new IgniteCallable<String>() { @Override public String call() throws IgniteException { - GridCacheAtomicReference<String> ref = ignite.cache(null).dataStructures().atomicReference(refName, val, true); + try { + GridCacheAtomicReference<String> ref = ignite.cache(null).dataStructures().atomicReference(refName, val, true); - assertEquals(newVal, ref.get()); + assertEquals(newVal, ref.get()); - return ref.get(); + return ref.get(); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } }); } @@ -151,13 +166,18 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid // Execute task on all grid nodes. ignite.compute().call(new IgniteCallable<String>() { @Override public String call() throws IgniteException { - GridCacheAtomicStamped<String, String> stamped = ignite.cache(null).dataStructures() - .atomicStamped(stampedName, val, stamp, true); - - assertEquals(val, stamped.value()); - assertEquals(stamp, stamped.stamp()); - - return stamped.value(); + try { + GridCacheAtomicStamped<String, String> stamped = ignite.cache(null).dataStructures() + .atomicStamped(stampedName, val, stamp, true); + + assertEquals(val, stamped.value()); + assertEquals(stamp, stamped.stamp()); + + return stamped.value(); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } }); @@ -166,13 +186,18 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid // Execute task on all grid nodes. ignite.compute().call(new IgniteCallable<String>() { @Override public String call() throws IgniteException { - GridCacheAtomicStamped<String, String> stamped = ignite.cache(null).dataStructures() - .atomicStamped(stampedName, val, stamp, true); - - assertEquals(val, stamped.value()); - assertEquals(stamp, stamped.stamp()); - - return stamped.value(); + try { + GridCacheAtomicStamped<String, String> stamped = ignite.cache(null).dataStructures() + .atomicStamped(stampedName, val, stamp, true); + + assertEquals(val, stamped.value()); + assertEquals(stamp, stamped.stamp()); + + return stamped.value(); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } }); @@ -181,13 +206,18 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid // Execute task on all grid nodes. ignite.compute().call(new IgniteCallable<String>() { @Override public String call() throws IgniteException { - GridCacheAtomicStamped<String, String> stamped = ignite.cache(null).dataStructures() - .atomicStamped(stampedName, val, stamp, true); - - assertEquals(newVal, stamped.value()); - assertEquals(newStamp, stamped.stamp()); - - return stamped.value(); + try { + GridCacheAtomicStamped<String, String> stamped = ignite.cache(null).dataStructures() + .atomicStamped(stampedName, val, stamp, true); + + assertEquals(newVal, stamped.value()); + assertEquals(newStamp, stamped.stamp()); + + return stamped.value(); + } + 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/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java index 7c335bf..fe8d511 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java @@ -647,8 +647,14 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY, - false, true); + GridCacheQueue<Integer> queue = null; + try { + queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY, + false, true); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } assertNotNull(queue); @@ -694,8 +700,14 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY, - false, true); + GridCacheQueue<Integer> queue = null; + try { + queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY, + false, true); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } assertNotNull(queue); @@ -750,8 +762,14 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - GridCacheQueue<String> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY, - false, true); + GridCacheQueue<String> queue = null; + try { + queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY, + false, true); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } assertNotNull(queue); @@ -802,8 +820,14 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + ']'); - GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY, - false, true); + GridCacheQueue<Integer> queue = null; + try { + queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY, + false, true); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } assertNotNull(queue); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java index 7fe2792..b00a65b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java @@ -159,7 +159,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo try { assert grid(1).compute().call(new TakeJob(queueName)); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { error(e.getMessage(), e); } } @@ -214,8 +214,14 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures() - .queue(queueName, QUEUE_CAPACITY, true, true); + GridCacheQueue<Integer> queue = null; + try { + queue = ignite.cache(null).dataStructures() + .queue(queueName, QUEUE_CAPACITY, true, true); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } assertNotNull(queue); @@ -266,8 +272,14 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - GridCacheQueue<String> queue = ignite.cache(null).dataStructures() - .queue(queueName, QUEUE_CAPACITY, true, true); + GridCacheQueue<String> queue = null; + try { + queue = ignite.cache(null).dataStructures() + .queue(queueName, QUEUE_CAPACITY, true, true); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } assertNotNull(queue); @@ -318,8 +330,14 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + ']'); - GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures() - .queue(queueName, QUEUE_CAPACITY, true, true); + GridCacheQueue<Integer> queue = null; + try { + queue = ignite.cache(null).dataStructures() + .queue(queueName, QUEUE_CAPACITY, true, true); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } assertNotNull(queue); @@ -366,8 +384,14 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + ']'); - GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures() - .queue(queueName, QUEUE_CAPACITY, true, true); + GridCacheQueue<Integer> queue = null; + try { + queue = ignite.cache(null).dataStructures() + .queue(queueName, QUEUE_CAPACITY, true, true); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } assertNotNull(queue); @@ -414,14 +438,19 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures() - .queue(queueName, QUEUE_CAPACITY, true, false); + try { + GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures() + .queue(queueName, QUEUE_CAPACITY, true, false); - assert queue != null; + assert queue != null; - assert queue.capacity() == QUEUE_CAPACITY; + assert queue.capacity() == QUEUE_CAPACITY; - assert ignite.cache(null).dataStructures().removeQueue(queueName); + assert ignite.cache(null).dataStructures().removeQueue(queueName); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java index c8e2ad7..4069adc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java @@ -13,11 +13,10 @@ import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.datastructures.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; @@ -201,23 +200,28 @@ public abstract class GridCacheSequenceMultiNodeAbstractSelfTest extends GridCom if (log.isInfoEnabled()) log.info("Running IncrementAndGetJob on node: " + ignite.cluster().localNode().id()); - GridCacheAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence(seqName, 0, true); + try { + GridCacheAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence(seqName, 0, true); - assert seq != null; + assert seq != null; - // Result set. - Set<Long> resSet = new HashSet<>(); + // Result set. + Set<Long> resSet = new HashSet<>(); - // Get sequence value and try to put it result set. - for (int i = 0; i < retries; i++) { - long val = seq.incrementAndGet(); + // Get sequence value and try to put it result set. + for (int i = 0; i < retries; i++) { + long val = seq.incrementAndGet(); - assert !resSet.contains(val) : "Element already in set : " + val; + assert !resSet.contains(val) : "Element already in set : " + val; - resSet.add(val); - } + resSet.add(val); + } - return resSet; + return resSet; + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } } @@ -255,23 +259,28 @@ public abstract class GridCacheSequenceMultiNodeAbstractSelfTest extends GridCom if (log.isInfoEnabled()) log.info("Running GetAndIncrementJob on node: " + ignite.cluster().localNode().id()); - GridCacheAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence(seqName, 0, true); + try { + GridCacheAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence(seqName, 0, true); - assert seq != null; + assert seq != null; - // Result set. - Set<Long> resSet = new HashSet<>(); + // Result set. + Set<Long> resSet = new HashSet<>(); - // Get sequence value and try to put it result set. - for (int i = 0; i < retries; i++) { - long val = seq.getAndIncrement(); + // Get sequence value and try to put it result set. + for (int i = 0; i < retries; i++) { + long val = seq.getAndIncrement(); - assert !resSet.contains(val) : "Element already in set : " + val; + assert !resSet.contains(val) : "Element already in set : " + val; - resSet.add(val); - } + resSet.add(val); + } - return resSet; + return resSet; + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java index a399a81..65eb10b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java @@ -97,8 +97,14 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra @Override public Void call() throws IgniteException { Ignite ignite = grid(0); - GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAP, - true, true); + GridCacheQueue<Integer> queue = null; + try { + queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAP, + true, true); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } for (int i = 0; i < QUEUE_CAP * 2; i++) { if (i == QUEUE_CAP) { @@ -137,8 +143,14 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra @Override public Void call() throws IgniteException { Ignite ignite = grid(GRID_CNT); - GridCacheQueue<Integer> queue = ignite.cache(null).dataStructures(). - queue(queueName, Integer.MAX_VALUE, true, true); + GridCacheQueue<Integer> queue = null; + try { + queue = ignite.cache(null).dataStructures(). + queue(queueName, Integer.MAX_VALUE, true, true); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } int cnt = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java index 8185447..6748c88 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java @@ -19,6 +19,7 @@ import org.gridgain.grid.cache.affinity.consistenthash.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; @@ -260,10 +261,15 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { if (evt == LifecycleEventType.AFTER_GRID_START) { GridCache<Integer, String> c = ignite.cache(null); - if (c.putxIfAbsent(-1, "true")) { - populate(ignite.<Integer, String>cache(null), cnt); + try { + if (c.putxIfAbsent(-1, "true")) { + populate(ignite.<Integer, String>cache(null), cnt); - info(">>> POPULATED GRID <<<"); + info(">>> POPULATED GRID <<<"); + } + } + 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/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java index a1b3425..653e9bd 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java @@ -14,11 +14,11 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.util.typedef.*; +import org.gridgain.grid.util.typedef.internal.*; import java.util.*; @@ -95,11 +95,16 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo int i = 0; - for (Object key : keys) { - c1.put(key, new MyValue(value(key))); + try { + for (Object key : keys) { + c1.put(key, new MyValue(value(key))); - if (i++ % 2 == 0) - c2.put(key, new MyValue(value(key))); + if (i++ % 2 == 0) + c2.put(key, new MyValue(value(key))); + } + } + catch (IgniteCheckedException e) { + throw U.wrap(e); } assert c1.size() == keys.length : "Invalid cache1 size [size=" + c1.size() + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java index cc4278a..7bd6531 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java @@ -411,7 +411,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { assert false : "Exception should 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/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java index c42022a..1597cb6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java @@ -516,7 +516,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { assert false : "Exception was not thrown."; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { assertTrue(e.getMessage().startsWith( "Failed to register remote continuous listener (projection is empty).")); } @@ -1036,7 +1036,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { comp.future().get(3000); } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { // Ignore all job execution related errors. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java index 2544402..e31a337 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java @@ -459,7 +459,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm return metrics.blocksReadTotal() == blocksRead && metrics.blocksReadRemote() == blocksReadRmt; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { throw new RuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java index 517d36a..15194ea 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java @@ -296,7 +296,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes try { paths = ggfs.listFiles(SUBDIR); } - catch (IgniteCheckedException ignore) { + catch (IgniteException ignore) { // No-op. } @@ -329,7 +329,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes try { info = ggfs.info(DIR); } - catch (IgniteCheckedException ignore) { + catch (IgniteException ignore) { // No-op. } @@ -686,7 +686,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes return null; } - }, IgniteCheckedException.class, "Failed to delete the path due to secondary file system exception:"); + }, IgniteException.class, "Failed to delete the path due to secondary file system exception:"); else { GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -1083,7 +1083,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes checkFileContent(ggfs, path, chunk); } - catch (IOException | IgniteCheckedException e) { + catch (IOException | IgniteCheckedException | IgniteException e) { err.compareAndSet(null, e); // Log the very first error. } } @@ -1124,7 +1124,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes createCtr.incrementAndGet(); } - catch (IgniteCheckedException ignore) { + catch (IgniteException ignore) { try { U.sleep(10); } @@ -1443,7 +1443,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes chunksCtr.incrementAndGet(); } - catch (IgniteCheckedException ignore) { + catch (IgniteException ignore) { try { U.sleep(10); } @@ -1518,7 +1518,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes try { ggfs.mkdirs(SUBSUBDIR); } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } @@ -1533,7 +1533,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes try { return ggfs.delete(DIR, true); } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } @@ -1570,7 +1570,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes return true; } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } @@ -1583,7 +1583,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes try { return ggfs.delete(SUBDIR, true); } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } @@ -1634,7 +1634,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes return true; } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } @@ -1647,7 +1647,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes try { return ggfs.delete(SUBDIR_NEW, true); } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } @@ -1690,7 +1690,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes return true; } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } @@ -1705,7 +1705,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes return true; } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } @@ -1750,7 +1750,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes return true; } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } @@ -1765,7 +1765,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes return true; } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } @@ -1978,7 +1978,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes ggfs.rename(fromPath, toPath); } - catch (IgniteCheckedException ignore) { + catch (IgniteException ignore) { // No-op. } } @@ -2002,7 +2002,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes ggfs.delete(path, true); } - catch (IgniteCheckedException ignore) { + catch (IgniteException ignore) { // No-op. } } @@ -2026,7 +2026,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes ggfs.update(path, properties("owner", "group", null)); } - catch (IgniteCheckedException ignore) { + catch (IgniteException ignore) { // No-op. } } @@ -2053,7 +2053,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes ggfs.mkdirs(path); } - catch (IgniteCheckedException ignore) { + catch (IgniteException ignore) { // No-op. } } @@ -2088,7 +2088,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes U.closeQuiet(os); } } - catch (IOException | IgniteCheckedException ignore) { + catch (IOException | IgniteException ignore) { // No-op. } } @@ -2240,7 +2240,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes try { ggfs.update(file, Collections.singletonMap("prop", "val")); } - 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/processors/ggfs/GridGgfsDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java index 9758af7..2dfa67d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java @@ -1392,7 +1392,7 @@ public abstract class GridGgfsDualAbstractSelfTest extends GridGgfsAbstractSelfT return true; } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } @@ -1448,7 +1448,7 @@ public abstract class GridGgfsDualAbstractSelfTest extends GridGgfsAbstractSelfT return true; } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } @@ -1500,7 +1500,7 @@ public abstract class GridGgfsDualAbstractSelfTest extends GridGgfsAbstractSelfT return true; } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } @@ -1515,7 +1515,7 @@ public abstract class GridGgfsDualAbstractSelfTest extends GridGgfsAbstractSelfT return true; } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } @@ -1560,7 +1560,7 @@ public abstract class GridGgfsDualAbstractSelfTest extends GridGgfsAbstractSelfT return true; } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } @@ -1575,7 +1575,7 @@ public abstract class GridGgfsDualAbstractSelfTest extends GridGgfsAbstractSelfT return true; } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { return false; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java index cae7c61..5a16439 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java @@ -61,9 +61,9 @@ public class GridGgfsFileInfoSelfTest extends GridGgfsCommonAbstractTest { * Test node info serialization. * * @param info Node info to test serialization for. - * @throws IgniteCheckedException If failed. + * @throws IgniteException If failed. */ - public void testSerialization(GridGgfsFileInfo info) throws IgniteCheckedException { + public void testSerialization(GridGgfsFileInfo info) throws IgniteException { assertEquals(info, mu(info)); } @@ -72,9 +72,9 @@ public class GridGgfsFileInfoSelfTest extends GridGgfsCommonAbstractTest { * * @param obj Object to marshal/unmarshal. * @return Marshalled and then unmarshalled object. - * @throws IgniteCheckedException In case of any marshalling exception. + * @throws IgniteException In case of any marshalling exception. */ - private <T> T mu(T obj) throws IgniteCheckedException { + private <T> T mu(T obj) throws IgniteException { return marshaller.unmarshal(marshaller.marshal(obj), null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java index d32f6ac..1db76a7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java @@ -458,7 +458,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT fail("No exception has been thrown."); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { if (testLoc) { if ("Failed to start processor: GridProcessorAdapter []".equals(e.getMessage()) && e.getCause().getMessage().contains(excMsgSnippet)) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java index cafff4e..e9e967a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java @@ -82,7 +82,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { fail("Expected exception not thrown."); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Got expected exception: " + e); } } @@ -107,7 +107,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { fail("Expected exception not thrown."); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Got 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/service/GridServiceProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java index 835bb26..8811226 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java @@ -185,7 +185,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs fail("Failed to receive mismatching configuration exception."); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { info("Received mismatching configuration exception: " + e.getMessage()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/lang/GridFutureListenPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridFutureListenPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridFutureListenPerformanceTest.java index 871a25a..1520111 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/GridFutureListenPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridFutureListenPerformanceTest.java @@ -72,7 +72,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/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java b/modules/core/src/test/java/org/gridgain/grid/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java index 4f3e036..726e012 100644 --- a/modules/core/src/test/java/org/gridgain/grid/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java @@ -222,7 +222,7 @@ public class GridFileSwapSpaceSpiMultithreadedLoadTest extends GridCommonAbstrac } } } - 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/p2p/GridP2PLocalDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PLocalDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PLocalDeploymentSelfTest.java index 3f3339b..cc41834 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PLocalDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PLocalDeploymentSelfTest.java @@ -232,7 +232,7 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { return Collections.singletonMap(new TestJob(arg), node); } - throw new IgniteCheckedException("Failed to find target node: " + arg); + throw new IgniteException("Failed to find target node: " + arg); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java index 8fde401..27eb426 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java @@ -87,14 +87,14 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe assert false; // Exception must be thrown. } - catch (IgniteCheckedException e) { + catch (IgniteException e) { // Throwing exception is a correct behaviour. info("Received correct exception: " + e); } } /** - * Querying events here throws {@link IgniteCheckedException}. + * Querying events here throws {@link IgniteException}. * This is correct behavior. * * @param g Grid. @@ -106,7 +106,7 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe assert false; // Exception must be thrown. } - catch (IgniteCheckedException e) { + catch (IgniteException e) { // Throwing exception is a correct behaviour. info("Received correct exception: " + e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTimeoutSelfTest.java index e1aa70d..388cd7a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTimeoutSelfTest.java @@ -73,7 +73,7 @@ public class GridP2PTimeoutSelfTest extends GridCommonAbstractTest { assert false; // Timeout exception must be thrown. } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { // Throwing exception is a correct behaviour. } } @@ -115,7 +115,7 @@ public class GridP2PTimeoutSelfTest extends GridCommonAbstractTest { assert false; // Timeout exception must be thrown. } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { // Throwing exception is a correct behaviour. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java index 0917224..b695090 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java @@ -194,7 +194,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb Thread.sleep(200); } catch (InterruptedException e) { - throw new IgniteCheckedException("Got interrupted during reducing.", e); + throw new IgniteException("Got interrupted during reducing.", e); } try { @@ -214,7 +214,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb } } catch (Exception e) { - throw new IgniteCheckedException("Running state check failure.", e); + throw new IgniteException("Running state check failure.", e); } return res; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java index b733979..81c0a6c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java @@ -125,7 +125,7 @@ public class GridSessionCollisionSpiSelfTest extends GridCommonAbstractTest { if (log.isInfoEnabled()) log.info("Set session attribute for job: " + jobId); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { log.error("Failed to set session attribute: " + job, e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.java index db5d0de..010e8c8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobFailoverSelfTest.java @@ -97,7 +97,7 @@ public class GridSessionJobFailoverSelfTest 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); } if (fail) { @@ -108,7 +108,7 @@ public class GridSessionJobFailoverSelfTest extends GridCommonAbstractTest { ses.setAttribute("test.job.attr." + i, ii); } - throw new IgniteCheckedException("Job exception."); + throw new IgniteException("Job exception."); } try { @@ -125,7 +125,7 @@ public class GridSessionJobFailoverSelfTest extends GridCommonAbstractTest { } } 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); } // 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/session/GridSessionJobWaitTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java index 66ae464..c18e29b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java @@ -159,7 +159,7 @@ public class GridSessionJobWaitTaskAttributeSelfTest extends GridCommonAbstractT fail("Invalid test session 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); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java index ef9cc5e..43a5d6b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java @@ -206,7 +206,7 @@ public class GridSessionSetFutureAttributeSelfTest extends GridCommonAbstractTes 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/GridSessionSetFutureAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java index b5d50d5..98df21c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java @@ -160,7 +160,7 @@ public class GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommo return 1; } catch (InterruptedException e) { - throw new IgniteCheckedException("Failed to wait for listener due to interruption.", e); + throw new IgniteException("Failed to wait for listener due to interruption.", e); } } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttribute2SelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttribute2SelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttribute2SelfTest.java index dee2348..3269482 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttribute2SelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttribute2SelfTest.java @@ -88,7 +88,7 @@ public class GridSessionSetJobAttribute2SelfTest extends GridCommonAbstractTest Thread.sleep(100); } catch (InterruptedException e) { - throw new IgniteCheckedException("Got interrupted while while sleeping.", e); + throw new IgniteException("Got interrupted while while sleeping.", e); } Serializable ser = taskSes.getAttribute(TEST_ATTR_KEY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java index e7a787e..7d00c59 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java @@ -101,7 +101,7 @@ public class GridSessionSetJobAttributeOrderSelfTest extends GridCommonAbstractT } } 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); } return taskSes.getAttribute(TEST_ATTR_KEY); @@ -128,7 +128,7 @@ public class GridSessionSetJobAttributeOrderSelfTest extends GridCommonAbstractT assert attr : "Failed to wait for attribute value."; } 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); } Integer res = taskSes.getAttribute(TEST_ATTR_KEY); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java index fe98080..318e716 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java @@ -160,7 +160,7 @@ public class GridSessionSetJobAttributeSelfTest 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); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4307bca1/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java index 8dddb15..bf0c1f1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java @@ -158,7 +158,7 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAb return lsnr.getAttributes().size() == 0 ? 0 : 1; } catch (InterruptedException e) { - throw new IgniteCheckedException("Failed to wait for listener due to interruption.", e); + throw new IgniteException("Failed to wait for listener due to interruption.", e); } } });
