http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskSessionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskSessionImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskSessionImpl.java index 1466b76..500cadc 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskSessionImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskSessionImpl.java @@ -450,12 +450,12 @@ public class GridTaskSessionImpl implements GridTaskSessionInternal { } /** {@inheritDoc} */ - @Override public Collection<ComputeJobSibling> refreshJobSiblings() throws IgniteCheckedException { + @Override public Collection<ComputeJobSibling> refreshJobSiblings() { return getJobSiblings(); } /** {@inheritDoc} */ - @Override public Collection<ComputeJobSibling> getJobSiblings() throws IgniteCheckedException { + @Override public Collection<ComputeJobSibling> getJobSiblings() { synchronized (mux) { return siblings; } @@ -486,7 +486,7 @@ public class GridTaskSessionImpl implements GridTaskSessionInternal { } /** {@inheritDoc} */ - @Override public ComputeJobSibling getJobSibling(IgniteUuid jobId) throws IgniteCheckedException { + @Override public ComputeJobSibling getJobSibling(IgniteUuid jobId) { A.notNull(jobId, "jobId"); Collection<ComputeJobSibling> tmp = getJobSiblings(); @@ -499,7 +499,7 @@ public class GridTaskSessionImpl implements GridTaskSessionInternal { } /** {@inheritDoc} */ - @Override public void setAttribute(Object key, Object val) throws IgniteCheckedException { + @Override public void setAttribute(Object key, Object val) { A.notNull(key, "key"); checkFullSupport(); @@ -520,7 +520,7 @@ public class GridTaskSessionImpl implements GridTaskSessionInternal { } /** {@inheritDoc} */ - @Override public void setAttributes(Map<?, ?> attrs) throws IgniteCheckedException { + @Override public void setAttributes(Map<?, ?> attrs) throws IgniteException { A.notNull(attrs, "attrs"); checkFullSupport(); @@ -539,8 +539,14 @@ public class GridTaskSessionImpl implements GridTaskSessionInternal { this.attrs.putAll(attrs); } - if (isTaskNode()) - ctx.task().setAttributes(this, attrs); + if (isTaskNode()) { + try { + ctx.task().setAttributes(this, attrs); + } + catch (IgniteCheckedException e) { + U.wrap(e); + } + } } /** {@inheritDoc} */ @@ -635,20 +641,25 @@ public class GridTaskSessionImpl implements GridTaskSessionInternal { } /** {@inheritDoc} */ - @Override public void saveCheckpoint(String key, Object state) throws IgniteCheckedException { + @Override public void saveCheckpoint(String key, Object state) throws IgniteException { saveCheckpoint(key, state, ComputeTaskSessionScope.SESSION_SCOPE, 0); } /** {@inheritDoc} */ @Override public void saveCheckpoint(String key, Object state, ComputeTaskSessionScope scope, long timeout) - throws IgniteCheckedException { + throws IgniteException { saveCheckpoint(key, state, scope, timeout, true); } /** {@inheritDoc} */ @Override public void saveCheckpoint(String key, Object state, ComputeTaskSessionScope scope, - long timeout, boolean overwrite) throws IgniteCheckedException { - saveCheckpoint0(this, key, state, scope, timeout, overwrite); + long timeout, boolean overwrite) throws IgniteException { + try { + saveCheckpoint0(this, key, state, scope, timeout, overwrite); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } /** @@ -677,8 +688,13 @@ public class GridTaskSessionImpl implements GridTaskSessionInternal { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public <T> T loadCheckpoint(String key) throws IgniteCheckedException { - return loadCheckpoint0(this, key); + @Override public <T> T loadCheckpoint(String key) throws IgniteException { + try { + return loadCheckpoint0(this, key); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } /** @@ -701,7 +717,7 @@ public class GridTaskSessionImpl implements GridTaskSessionInternal { } /** {@inheritDoc} */ - @Override public boolean removeCheckpoint(String key) throws IgniteCheckedException { + @Override public boolean removeCheckpoint(String key) throws IgniteException { return removeCheckpoint0(this, key); } @@ -709,15 +725,15 @@ public class GridTaskSessionImpl implements GridTaskSessionInternal { * @param ses Session. * @param key Key. * @return {@code True} if removed. - * @throws IgniteCheckedException If failed. + * @throws IgniteException If failed. */ - protected boolean removeCheckpoint0(GridTaskSessionInternal ses, String key) throws IgniteCheckedException { + protected boolean removeCheckpoint0(GridTaskSessionInternal ses, String key) throws IgniteException { assert ses != null; // Internal call, so assert should be enough. A.notNull(key, "key"); if (closed) - throw new IgniteCheckedException("Failed to remove checkpoint (session closed): " + ses); + throw new IgniteException("Failed to remove checkpoint (session closed): " + ses); checkFullSupport();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteClusterAsyncImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteClusterAsyncImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteClusterAsyncImpl.java index 613ce00..b1ab56b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteClusterAsyncImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteClusterAsyncImpl.java @@ -12,8 +12,8 @@ package org.gridgain.grid.kernal; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.lang.*; +import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; import java.io.*; @@ -67,45 +67,50 @@ public class IgniteClusterAsyncImpl extends IgniteAsyncSupportAdapter implements /** {@inheritDoc} */ @Override public <K> Map<ClusterNode, Collection<K>> mapKeysToNodes(@Nullable String cacheName, - @Nullable Collection<? extends K> keys) throws IgniteCheckedException { + @Nullable Collection<? extends K> keys) throws IgniteException { return grid.mapKeysToNodes(cacheName, keys); } /** {@inheritDoc} */ - @Nullable @Override public <K> ClusterNode mapKeyToNode(@Nullable String cacheName, K key) throws IgniteCheckedException { + @Nullable @Override public <K> ClusterNode mapKeyToNode(@Nullable String cacheName, K key) throws IgniteException { return grid.mapKeyToNode(cacheName, key); } /** {@inheritDoc} */ @Override public Collection<GridTuple3<String, Boolean, String>> startNodes(File file, - boolean restart, int timeout, int maxConn) throws IgniteCheckedException { + boolean restart, int timeout, int maxConn) throws IgniteException { return saveOrGet(grid.startNodesAsync(file, restart, timeout, maxConn)); } /** {@inheritDoc} */ @Override public Collection<GridTuple3<String, Boolean, String>> startNodes( Collection<Map<String, Object>> hosts, @Nullable Map<String, Object> dflts, boolean restart, int timeout, - int maxConn) throws IgniteCheckedException { - return saveOrGet(grid.startNodesAsync(hosts, dflts, restart, timeout, maxConn)); + int maxConn) throws IgniteException { + try { + return saveOrGet(grid.startNodesAsync(hosts, dflts, restart, timeout, maxConn)); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } /** {@inheritDoc} */ - @Override public void stopNodes() throws IgniteCheckedException { + @Override public void stopNodes() throws IgniteException { grid.stopNodes(); } /** {@inheritDoc} */ - @Override public void stopNodes(Collection<UUID> ids) throws IgniteCheckedException { + @Override public void stopNodes(Collection<UUID> ids) throws IgniteException { grid.stopNodes(ids); } /** {@inheritDoc} */ - @Override public void restartNodes() throws IgniteCheckedException { + @Override public void restartNodes() throws IgniteException { grid.restartNodes(); } /** {@inheritDoc} */ - @Override public void restartNodes(Collection<UUID> ids) throws IgniteCheckedException { + @Override public void restartNodes(Collection<UUID> ids) throws IgniteException { grid.restartNodes(ids); } @@ -225,7 +230,7 @@ public class IgniteClusterAsyncImpl extends IgniteAsyncSupportAdapter implements } /** {@inheritDoc} */ - @Override public ClusterMetrics metrics() throws IgniteCheckedException { + @Override public ClusterMetrics metrics() throws IgniteException { return grid.metrics(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteComputeImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteComputeImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteComputeImpl.java index 7205e76..5e707b9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteComputeImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteComputeImpl.java @@ -89,7 +89,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { } /** {@inheritDoc} */ - @Override public void affinityRun(@Nullable String cacheName, Object affKey, Runnable job) throws IgniteCheckedException { + @Override public void affinityRun(@Nullable String cacheName, Object affKey, Runnable job) throws IgniteException { A.notNull(affKey, "affKey"); A.notNull(job, "job"); @@ -105,7 +105,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { /** {@inheritDoc} */ @Override public <R> R affinityCall(@Nullable String cacheName, Object affKey, Callable<R> job) - throws IgniteCheckedException { + throws IgniteException { A.notNull(affKey, "affKey"); A.notNull(job, "job"); @@ -120,7 +120,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { } /** {@inheritDoc} */ - @Override public <T, R> R execute(String taskName, @Nullable T arg) throws IgniteCheckedException { + @Override public <T, R> R execute(String taskName, @Nullable T arg) throws IgniteException { A.notNull(taskName, "taskName"); guard(); @@ -138,7 +138,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { /** {@inheritDoc} */ @Override public <T, R> R execute(Class<? extends ComputeTask<T, R>> taskCls, - @Nullable T arg) throws IgniteCheckedException { + @Nullable T arg) throws IgniteException { A.notNull(taskCls, "taskCls"); guard(); @@ -155,7 +155,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { } /** {@inheritDoc} */ - @Override public <T, R> R execute(ComputeTask<T, R> task, @Nullable T arg) throws IgniteCheckedException { + @Override public <T, R> R execute(ComputeTask<T, R> task, @Nullable T arg) throws IgniteException { A.notNull(task, "task"); guard(); @@ -172,7 +172,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { } /** {@inheritDoc} */ - @Override public void broadcast(Runnable job) throws IgniteCheckedException { + @Override public void broadcast(Runnable job) throws IgniteException { A.notNull(job, "job"); guard(); @@ -186,7 +186,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { } /** {@inheritDoc} */ - @Override public <R> Collection<R> broadcast(Callable<R> job) throws IgniteCheckedException { + @Override public <R> Collection<R> broadcast(Callable<R> job) throws IgniteException { A.notNull(job, "job"); guard(); @@ -200,7 +200,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { } /** {@inheritDoc} */ - @Override public <R, T> Collection<R> broadcast(IgniteClosure<T, R> job, @Nullable T arg) throws IgniteCheckedException { + @Override public <R, T> Collection<R> broadcast(IgniteClosure<T, R> job, @Nullable T arg) throws IgniteException { A.notNull(job, "job"); guard(); @@ -214,7 +214,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { } /** {@inheritDoc} */ - @Override public void run(Runnable job) throws IgniteCheckedException { + @Override public void run(Runnable job) throws IgniteException { A.notNull(job, "job"); guard(); @@ -228,7 +228,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { } /** {@inheritDoc} */ - @Override public void run(Collection<? extends Runnable> jobs) throws IgniteCheckedException { + @Override public void run(Collection<? extends Runnable> jobs) throws IgniteException { A.notEmpty(jobs, "jobs"); guard(); @@ -242,7 +242,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { } /** {@inheritDoc} */ - @Override public <R, T> R apply(IgniteClosure<T, R> job, @Nullable T arg) throws IgniteCheckedException { + @Override public <R, T> R apply(IgniteClosure<T, R> job, @Nullable T arg) throws IgniteException { A.notNull(job, "job"); guard(); @@ -256,7 +256,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { } /** {@inheritDoc} */ - @Override public <R> R call(Callable<R> job) throws IgniteCheckedException { + @Override public <R> R call(Callable<R> job) throws IgniteException { A.notNull(job, "job"); guard(); @@ -270,7 +270,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { } /** {@inheritDoc} */ - @Override public <R> Collection<R> call(Collection<? extends Callable<R>> jobs) throws IgniteCheckedException { + @Override public <R> Collection<R> call(Collection<? extends Callable<R>> jobs) throws IgniteException { A.notEmpty(jobs, "jobs"); guard(); @@ -285,7 +285,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { /** {@inheritDoc} */ @Override public <T, R> Collection<R> apply(final IgniteClosure<T, R> job, - @Nullable Collection<? extends T> args) throws IgniteCheckedException { + @Nullable Collection<? extends T> args) throws IgniteException { A.notNull(job, "job"); A.notNull(args, "args"); @@ -301,7 +301,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { /** {@inheritDoc} */ @Override public <R1, R2> R2 call(Collection<? extends Callable<R1>> jobs, IgniteReducer<R1, R2> rdc) - throws IgniteCheckedException { + throws IgniteException { A.notEmpty(jobs, "jobs"); A.notNull(rdc, "rdc"); @@ -317,7 +317,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { /** {@inheritDoc} */ @Override public <R1, R2, T> R2 apply(IgniteClosure<T, R1> job, Collection<? extends T> args, - IgniteReducer<R1, R2> rdc) throws IgniteCheckedException { + IgniteReducer<R1, R2> rdc) throws IgniteException { A.notNull(job, "job"); A.notNull(rdc, "rdc"); A.notNull(args, "args"); @@ -391,7 +391,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { } /** {@inheritDoc} */ - @Override public void localDeployTask(Class<? extends ComputeTask> taskCls, ClassLoader clsLdr) throws IgniteCheckedException { + @Override public void localDeployTask(Class<? extends ComputeTask> taskCls, ClassLoader clsLdr) throws IgniteException { A.notNull(taskCls, "taskCls", clsLdr, "clsLdr"); guard(); @@ -402,6 +402,9 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { if (dep == null) throw new GridDeploymentException("Failed to deploy task (was task (re|un)deployed?): " + taskCls); } + catch (IgniteCheckedException e) { + U.wrap(e); + } finally { unguard(); } @@ -420,7 +423,7 @@ public class IgniteComputeImpl implements IgniteCompute, Externalizable { } /** {@inheritDoc} */ - @Override public void undeployTask(String taskName) throws IgniteCheckedException { + @Override public void undeployTask(String taskName) throws IgniteException { A.notNull(taskName, "taskName"); guard(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteEventsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteEventsImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteEventsImpl.java index 466a9ea..7801b50 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteEventsImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteEventsImpl.java @@ -60,7 +60,7 @@ public class IgniteEventsImpl extends IgniteAsyncSupportAdapter implements Ignit /** {@inheritDoc} */ @Override public <T extends IgniteEvent> List<T> remoteQuery(IgnitePredicate<T> p, long timeout, - @Nullable int... types) throws IgniteCheckedException { + @Nullable int... types) throws IgniteException { A.notNull(p, "p"); guard(); @@ -75,14 +75,14 @@ public class IgniteEventsImpl extends IgniteAsyncSupportAdapter implements Ignit /** {@inheritDoc} */ @Override public <T extends IgniteEvent> UUID remoteListen(@Nullable IgniteBiPredicate<UUID, T> locLsnr, - @Nullable IgnitePredicate<T> rmtFilter, @Nullable int... types) throws IgniteCheckedException { + @Nullable IgnitePredicate<T> rmtFilter, @Nullable int... types) throws IgniteException { return remoteListen(1, 0, true, locLsnr, rmtFilter, types); } /** {@inheritDoc} */ @Override public <T extends IgniteEvent> UUID remoteListen(int bufSize, long interval, boolean autoUnsubscribe, @Nullable IgniteBiPredicate<UUID, T> locLsnr, @Nullable IgnitePredicate<T> rmtFilter, - @Nullable int... types) throws IgniteCheckedException { + @Nullable int... types) throws IgniteException { A.ensure(bufSize > 0, "bufSize > 0"); A.ensure(interval >= 0, "interval >= 0"); @@ -99,7 +99,7 @@ public class IgniteEventsImpl extends IgniteAsyncSupportAdapter implements Ignit } /** {@inheritDoc} */ - @Override public void stopRemoteListen(UUID opId) throws IgniteCheckedException { + @Override public void stopRemoteListen(UUID opId) throws IgniteException { A.notNull(opId, "consumeId"); guard(); @@ -114,7 +114,7 @@ public class IgniteEventsImpl extends IgniteAsyncSupportAdapter implements Ignit /** {@inheritDoc} */ @Override public <T extends IgniteEvent> T waitForLocal(@Nullable IgnitePredicate<T> filter, - @Nullable int... types) throws IgniteCheckedException { + @Nullable int... types) throws IgniteException { guard(); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteManagedImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteManagedImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteManagedImpl.java index f1d034e..fd861fc 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteManagedImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteManagedImpl.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.apache.ignite.managed.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -58,7 +57,7 @@ public class IgniteManagedImpl extends IgniteAsyncSupportAdapter implements Igni } /** {@inheritDoc} */ - @Override public void deployNodeSingleton(String name, ManagedService svc) throws IgniteCheckedException { + @Override public void deployNodeSingleton(String name, ManagedService svc) throws IgniteException { A.notNull(name, "name"); A.notNull(svc, "svc"); @@ -73,7 +72,7 @@ public class IgniteManagedImpl extends IgniteAsyncSupportAdapter implements Igni } /** {@inheritDoc} */ - @Override public void deployClusterSingleton(String name, ManagedService svc) throws IgniteCheckedException { + @Override public void deployClusterSingleton(String name, ManagedService svc) throws IgniteException { A.notNull(name, "name"); A.notNull(svc, "svc"); @@ -89,7 +88,7 @@ public class IgniteManagedImpl extends IgniteAsyncSupportAdapter implements Igni /** {@inheritDoc} */ @Override public void deployMultiple(String name, ManagedService svc, int totalCnt, int maxPerNodeCnt) - throws IgniteCheckedException { + throws IgniteException { A.notNull(name, "name"); A.notNull(svc, "svc"); @@ -105,7 +104,7 @@ public class IgniteManagedImpl extends IgniteAsyncSupportAdapter implements Igni /** {@inheritDoc} */ @Override public void deployKeyAffinitySingleton(String name, ManagedService svc, @Nullable String cacheName, - Object affKey) throws IgniteCheckedException { + Object affKey) throws IgniteException { A.notNull(name, "name"); A.notNull(svc, "svc"); A.notNull(affKey, "affKey"); @@ -121,7 +120,7 @@ public class IgniteManagedImpl extends IgniteAsyncSupportAdapter implements Igni } /** {@inheritDoc} */ - @Override public void deploy(ManagedServiceConfiguration cfg) throws IgniteCheckedException { + @Override public void deploy(ManagedServiceConfiguration cfg) throws IgniteException { A.notNull(cfg, "cfg"); guard(); @@ -135,7 +134,7 @@ public class IgniteManagedImpl extends IgniteAsyncSupportAdapter implements Igni } /** {@inheritDoc} */ - @Override public void cancel(String name) throws IgniteCheckedException { + @Override public void cancel(String name) throws IgniteException { A.notNull(name, "name"); guard(); @@ -149,7 +148,7 @@ public class IgniteManagedImpl extends IgniteAsyncSupportAdapter implements Igni } /** {@inheritDoc} */ - @Override public void cancelAll() throws IgniteCheckedException { + @Override public void cancelAll() throws IgniteException { guard(); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteMessagingImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteMessagingImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteMessagingImpl.java index 6bc3b27..4f1468b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteMessagingImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteMessagingImpl.java @@ -59,7 +59,7 @@ public class IgniteMessagingImpl extends IgniteAsyncSupportAdapter implements Ig } /** {@inheritDoc} */ - @Override public void send(@Nullable Object topic, Object msg) throws IgniteCheckedException { + @Override public void send(@Nullable Object topic, Object msg) throws IgniteException { A.notNull(msg, "msg"); guard(); @@ -70,7 +70,12 @@ public class IgniteMessagingImpl extends IgniteAsyncSupportAdapter implements Ig if (snapshot.isEmpty()) throw U.emptyTopologyException(); - ctx.io().sendUserMessage(snapshot, msg, topic, false, 0); + try { + ctx.io().sendUserMessage(snapshot, msg, topic, false, 0); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } finally { unguard(); @@ -78,7 +83,7 @@ public class IgniteMessagingImpl extends IgniteAsyncSupportAdapter implements Ig } /** {@inheritDoc} */ - @Override public void send(@Nullable Object topic, Collection<?> msgs) throws IgniteCheckedException { + @Override public void send(@Nullable Object topic, Collection<?> msgs) throws IgniteException { A.ensure(!F.isEmpty(msgs), "msgs cannot be null or empty"); guard(); @@ -92,7 +97,12 @@ public class IgniteMessagingImpl extends IgniteAsyncSupportAdapter implements Ig for (Object msg : msgs) { A.notNull(msg, "msg"); - ctx.io().sendUserMessage(snapshot, msg, topic, false, 0); + try { + ctx.io().sendUserMessage(snapshot, msg, topic, false, 0); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } } finally { @@ -101,7 +111,7 @@ public class IgniteMessagingImpl extends IgniteAsyncSupportAdapter implements Ig } /** {@inheritDoc} */ - @Override public void sendOrdered(@Nullable Object topic, Object msg, long timeout) throws IgniteCheckedException { + @Override public void sendOrdered(@Nullable Object topic, Object msg, long timeout) throws IgniteException { A.notNull(msg, "msg"); guard(); @@ -115,7 +125,12 @@ public class IgniteMessagingImpl extends IgniteAsyncSupportAdapter implements Ig if (timeout == 0) timeout = ctx.config().getNetworkTimeout(); - ctx.io().sendUserMessage(snapshot, msg, topic, true, timeout); + try { + ctx.io().sendUserMessage(snapshot, msg, topic, true, timeout); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } finally { unguard(); @@ -151,7 +166,7 @@ public class IgniteMessagingImpl extends IgniteAsyncSupportAdapter implements Ig } /** {@inheritDoc} */ - @Override public UUID remoteListen(@Nullable Object topic, IgniteBiPredicate<UUID, ?> p) throws IgniteCheckedException { + @Override public UUID remoteListen(@Nullable Object topic, IgniteBiPredicate<UUID, ?> p) throws IgniteException { A.notNull(p, "p"); guard(); @@ -167,7 +182,7 @@ public class IgniteMessagingImpl extends IgniteAsyncSupportAdapter implements Ig } /** {@inheritDoc} */ - @Override public void stopRemoteListen(UUID opId) throws IgniteCheckedException { + @Override public void stopRemoteListen(UUID opId) throws IgniteException { A.notNull(opId, "opId"); saveOrGet(ctx.continuous().stopRoutine(opId)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java index 52cd53d..8cf40dc 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java @@ -485,7 +485,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa } } } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to process message (will ignore): " + msg, e); } finally { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java index 453d2fb..3bdaa94 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java @@ -170,7 +170,7 @@ class GridDeploymentCommunication { try { req.responseTopic(marsh.unmarshal(req.responseTopicBytes(), null)); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to process deployment request (will ignore): " + req, e); return; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java index 54994d1..b19b95f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java @@ -235,8 +235,13 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { getSpi().setAuthenticator(new DiscoverySpiNodeAuthenticator() { @Override public GridSecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred) - throws IgniteCheckedException { - return ctx.security().authenticateNode(node, cred); + throws IgniteException { + try { + return ctx.security().authenticateNode(node, cred); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } @Override public boolean isGlobalNodeAuthentication() { @@ -1170,12 +1175,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { /** @return Event that represents a local node joined to topology. */ public IgniteDiscoveryEvent localJoinEvent() { - try { - return locJoinEvt.get(); - } - catch (IgniteCheckedException e) { - throw new IgniteException(e); - } + return locJoinEvt.get(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java index 87da0a9..e01e00f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java @@ -840,7 +840,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> if (res.exceptionBytes() != null) res.exception(marsh.<Throwable>unmarshal(res.exceptionBytes(), null)); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to unmarshal events query response: " + msg, e); return; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverContextImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverContextImpl.java index f275eaa..86c9650 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverContextImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverContextImpl.java @@ -63,8 +63,13 @@ public class GridFailoverContextImpl implements FailoverContext { } /** {@inheritDoc} */ - @Override public ClusterNode getBalancedNode(List<ClusterNode> top) throws IgniteCheckedException { - return loadMgr.getBalancedNode(taskSes, top, jobRes.getJob()); + @Override public ClusterNode getBalancedNode(List<ClusterNode> top) throws IgniteException { + try { + return loadMgr.getBalancedNode(taskSes, top, jobRes.getJob()); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java index bccc4d8..add93d5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java @@ -147,13 +147,13 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> { return new GridEmptyCloseableIterator<>(); return new IgniteSpiCloseableIterator<Object>() { - @Override public void close() throws IgniteCheckedException { + @Override public void close() throws IgniteException { if (res instanceof AutoCloseable) { try { ((AutoCloseable)res).close(); } catch (Exception e) { - throw new IgniteCheckedException(e); + throw new IgniteException(e); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/managers/loadbalancer/GridLoadBalancerManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/loadbalancer/GridLoadBalancerManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/loadbalancer/GridLoadBalancerManager.java index 78e2f15..416002f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/loadbalancer/GridLoadBalancerManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/loadbalancer/GridLoadBalancerManager.java @@ -89,19 +89,24 @@ public class GridLoadBalancerManager extends GridManagerAdapter<LoadBalancingSpi // Return value is not intended for sending over network. return new GridLoadBalancerAdapter() { @Nullable @Override public ClusterNode getBalancedNode(ComputeJob job, @Nullable Collection<ClusterNode> exclNodes) - throws IgniteCheckedException { + throws IgniteException { A.notNull(job, "job"); - if (F.isEmpty(exclNodes)) - return GridLoadBalancerManager.this.getBalancedNode(ses, top, job); + try { + if (F.isEmpty(exclNodes)) + return GridLoadBalancerManager.this.getBalancedNode(ses, top, job); - List<ClusterNode> nodes = F.loseList(top, true, exclNodes); + List<ClusterNode> nodes = F.loseList(top, true, exclNodes); - if (nodes.isEmpty()) - return null; + if (nodes.isEmpty()) + return null; - // Exclude list of nodes from topology. - return GridLoadBalancerManager.this.getBalancedNode(ses, nodes, job); + // Exclude list of nodes from topology. + return GridLoadBalancerManager.this.getBalancedNode(ses, nodes, job); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } }; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityImpl.java index 307b18d..4757194 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityImpl.java @@ -12,6 +12,7 @@ package org.gridgain.grid.kernal.managers.security; import org.apache.ignite.*; import org.apache.ignite.plugin.security.*; import org.gridgain.grid.kernal.*; +import org.gridgain.grid.util.typedef.internal.*; import java.io.*; import java.util.*; @@ -45,13 +46,23 @@ public class GridSecurityImpl implements GridSecurity, Externalizable { } /** {@inheritDoc} */ - @Override public Collection<GridSecuritySubject> authenticatedSubjects() throws IgniteCheckedException { - return secMgr.authenticatedSubjects(); + @Override public Collection<GridSecuritySubject> authenticatedSubjects() throws IgniteException { + try { + return secMgr.authenticatedSubjects(); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } /** {@inheritDoc} */ - @Override public GridSecuritySubject authenticatedSubject(UUID subjId) throws IgniteCheckedException { - return secMgr.authenticatedSubject(subjId); + @Override public GridSecuritySubject authenticatedSubject(UUID subjId) throws IgniteException { + try { + return secMgr.authenticatedSubject(subjId); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java index 926f717..de79ce6 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java @@ -344,7 +344,7 @@ public class GridAffinityAssignmentCache { if (fut != null) fut.get(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { throw new IgniteException("Failed to wait for affinity ready future for topology version: " + topVer, e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java index bf40a85..c0ac17d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java @@ -3230,7 +3230,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im try { lockFut.get(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { tx0.rollback(); throw e; @@ -3359,8 +3359,13 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im return ctx.closures().callLocalSafe( ctx.projectSafe(new Callable<Object>() { @Nullable - @Override public Object call() throws IgniteCheckedException { - loadCache(p, ttl, args); + @Override public Object call() throws IgniteException { + try { + loadCache(p, ttl, args); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } return null; } @@ -3620,7 +3625,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im // Ignore any exception from previous async operation as it should be handled by user. fut.get(); } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { // No-op. } } @@ -3631,9 +3636,9 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im * * @param primaryOnly {@code True} if only primary sizes should be included. * @return Global size. - * @throws IgniteCheckedException If internal task execution failed. + * @throws IgniteException If internal task execution failed. */ - private int globalSize(boolean primaryOnly) throws IgniteCheckedException { + private int globalSize(boolean primaryOnly) throws IgniteException { try { // Send job to remote nodes only. Collection<ClusterNode> nodes = ctx.grid().forCache(name()).forRemotes().nodes(); @@ -4417,8 +4422,13 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im ctx.denyOnFlags(F.asList(LOCAL, READ)); return ctx.closures().callLocalSafe(ctx.projectSafe(new Callable<V>() { - @Nullable @Override public V call() throws IgniteCheckedException { - return reload(key, filter); + @Nullable @Override public V call() throws IgniteException { + try { + return reload(key, filter); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } }), true); } @@ -4445,8 +4455,13 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im ctx.denyOnFlag(READ); return ctx.closures().callLocalSafe(ctx.projectSafe(new GPC() { - @Nullable @Override public Object call() throws IgniteCheckedException { - reloadAll(filter); + @Nullable @Override public Object call() throws IgniteException { + try { + reloadAll(filter); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java index e07211c..0e0ed40 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java @@ -1108,7 +1108,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V return; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Eviction future finished with error (all entries will be touched): " + fut, e); if (plcEnabled) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheGateway.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheGateway.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheGateway.java index 08e97e8..999c715 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheGateway.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheGateway.java @@ -89,7 +89,7 @@ public class GridCacheGateway<K, V> { preldr.startFuture().get(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { throw new IgniteException("Failed to wait for cache preloader start [cacheName=" + ctx.name() + "]", e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheIoManager.java index a222c32..60fd4bf 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheIoManager.java @@ -234,7 +234,7 @@ public class GridCacheIoManager<K, V> extends GridCacheSharedManagerAdapter<K, V processMessage(nodeId, cacheMsg, c); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { // Log once. if (startErr.compareAndSet(false, true)) U.error(log, "Failed to complete preload start future (will ignore message) " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java index f8b7623..5fb4fba 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java @@ -94,7 +94,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { ((LifecycleAware)store).stop(); } } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log(), "Failed to stop cache store.", e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapManager.java index 7a66e69..4fec224 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapManager.java @@ -325,7 +325,7 @@ public class GridCacheSwapManager<K, V> extends GridCacheManagerAdapter<K, V> { if (it != null) it.close(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { log.error("Failed to close iterator.", e); } finally { @@ -353,7 +353,7 @@ public class GridCacheSwapManager<K, V> extends GridCacheManagerAdapter<K, V> { * @return Reconstituted swap entry or {@code null} if entry is obsolete. * @throws IgniteCheckedException If failed. */ - @Nullable private GridCacheSwapEntry<V> swapEntry(GridCacheSwapEntry<V> e, boolean unmarshal) throws IgniteCheckedException { + @Nullable private GridCacheSwapEntry<V> swapEntry(GridCacheSwapEntry<V> e, boolean unmarshal) throws IgniteException { assert e != null; checkIteratorQueue(); @@ -1091,7 +1091,7 @@ public class GridCacheSwapManager<K, V> extends GridCacheManagerAdapter<K, V> { return !done; } - @Override protected void onClose() throws IgniteCheckedException { + @Override protected void onClose() throws IgniteException { if (it != null) it.close(); } @@ -1181,7 +1181,7 @@ public class GridCacheSwapManager<K, V> extends GridCacheManagerAdapter<K, V> { it.removeX(); } - @Override protected void onClose() throws IgniteCheckedException { + @Override protected void onClose() throws IgniteException { if (it != null) it.close(); } @@ -1298,7 +1298,7 @@ public class GridCacheSwapManager<K, V> extends GridCacheManagerAdapter<K, V> { } } - @Override protected void onClose() throws IgniteCheckedException { + @Override protected void onClose() throws IgniteException { it.close(); } }; @@ -1386,7 +1386,7 @@ public class GridCacheSwapManager<K, V> extends GridCacheManagerAdapter<K, V> { offheap.removex(spaceName, part, key, cur.getKey()); } - @Override protected void onClose() throws IgniteCheckedException { + @Override protected void onClose() throws IgniteException { it.close(); } }; @@ -1565,7 +1565,7 @@ public class GridCacheSwapManager<K, V> extends GridCacheManagerAdapter<K, V> { } /** {@inheritDoc} */ - @Override protected void onClose() throws IgniteCheckedException { + @Override protected void onClose() throws IgniteException { iter.close(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java index 84045a2..189ec08 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java @@ -772,13 +772,24 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter /** * */ - @Override public void close() throws IgniteCheckedException { + @Override public void close() throws IgniteException { GridCacheTxState state = state(); - if (state != ROLLING_BACK && state != ROLLED_BACK && state != COMMITTING && state != COMMITTED) - rollback(); + if (state != ROLLING_BACK && state != ROLLED_BACK && state != COMMITTING && state != COMMITTED) { + try { + rollback(); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } + } - awaitCompletion(); + try { + awaitCompletion(); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java index 85a240c..e0bfaaa 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java @@ -292,7 +292,7 @@ public class GridCacheTxHandler<K, V> { try { txFut.get(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { tx0.setRollbackOnly(); // Just in case. if (!(e instanceof GridCacheTxOptimisticException)) @@ -644,7 +644,7 @@ public class GridCacheTxHandler<K, V> { if (dhtTx != null && !F.isEmpty(dhtTx.invalidPartitions())) res.invalidPartitions(dhtTx.invalidPartitions()); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException | IgniteException e) { if (e instanceof GridCacheTxRollbackException) U.error(log, "Transaction was rolled back before prepare completed: " + dhtTx, e); else if (e instanceof GridCacheTxOptimisticException) { @@ -667,7 +667,7 @@ public class GridCacheTxHandler<K, V> { // Reply back to sender. ctx.io().send(nodeId, res); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException | IgniteException e) { if (e instanceof ClusterTopologyException) { if (log.isDebugEnabled()) log.debug("Failed to send tx response to remote node (node left grid) [node=" + nodeId + @@ -1415,7 +1415,7 @@ public class GridCacheTxHandler<K, V> { try { info = infoFut.get(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to obtain committed info for transaction (will rollback): " + req, e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java index 4ac7b4e..0f46d1c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java @@ -1573,7 +1573,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K catch (GridClosureException e) { return new GridFinishedFuture<>(cctx.kernalContext(), e.unwrap()); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { try { return plc2.apply(false, e); } @@ -2295,7 +2295,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K catch (GridClosureException e) { return new GridFinishedFuture<>(cctx.kernalContext(), e.unwrap()); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { try { return plc1.apply(false, e); } @@ -2320,7 +2320,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K }); } } - catch (IgniteCheckedException e) { + catch (IgniteException e) { setRollbackOnly(); return new GridFinishedFuture<>(cctx.kernalContext(), e); @@ -2468,7 +2468,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K catch (GridClosureException e) { return new GridFinishedFuture<>(cctx.kernalContext(), e.unwrap()); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { try { return plc1.apply(false, e); } @@ -2493,7 +2493,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K }); } } - catch (IgniteCheckedException e) { + catch (IgniteException e) { setRollbackOnly(); return new GridFinishedFuture<>(cctx.kernalContext(), e); @@ -2592,7 +2592,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K CU.<K, V>empty()) : new GridFinishedFuture<>(cctx.kernalContext()); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { setRollbackOnly(); return new GridFinishedFuture<Object>(cctx.kernalContext(), e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java index 7179f8e..91be2f3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java @@ -2186,7 +2186,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V tx.rollbackAsync(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to commit transaction during failover: " + tx, e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxyImpl.java index 4e61db6..e51ef0f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxyImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxProxyImpl.java @@ -178,7 +178,7 @@ public class GridCacheTxProxyImpl<K, V> implements GridCacheTxProxy, Externaliza } /** {@inheritDoc} */ - @Override public void close() throws IgniteCheckedException { + @Override public void close() throws IgniteException { enter(); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java index d28f728..6d32d35 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java @@ -1059,7 +1059,7 @@ public class GridCacheUtils { try { f.get(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { if (!F.isEmpty(excl)) for (Class cls : excl) if (e.hasCause(cls)) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java index e9f6828..7e8eea8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java @@ -252,7 +252,7 @@ public class GridCacheWriteBehindStore<K, V> implements GridCacheStore<K, V>, Li * * @throws IgniteCheckedException If cache cannot be started due to some reasons. */ - @Override public void start() throws IgniteCheckedException { + @Override public void start() throws IgniteException { assert cacheFlushFreq != 0 || cacheMaxSize != 0; if (stopping.compareAndSet(true, false)) { @@ -333,7 +333,7 @@ public class GridCacheWriteBehindStore<K, V> implements GridCacheStore<K, V>, Li * * @throws IgniteCheckedException If shutdown failed for some reason. */ - @Override public void stop() throws IgniteCheckedException { + @Override public void stop() throws IgniteException { if (stopping.compareAndSet(false, true)) { if (log.isDebugEnabled()) log.debug("Stopping write-behind store for cache '" + cacheName + '\''); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java index 3b768d9..69b98d6 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java @@ -154,7 +154,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager try { queueQry.close(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.warn(log, "Failed to cancel queue header query.", e); } } @@ -1474,7 +1474,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager } /** {@inheritDoc} */ - @Override public Void call() throws IgniteCheckedException { + @Override public Void call() throws IgniteException { GridCacheAdapter cache = ((GridKernal) ignite).context().cache().internalCache(cacheName); assert cache != null; @@ -1542,12 +1542,17 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager } /** {@inheritDoc} */ - @Override public Void call() throws IgniteCheckedException { + @Override public Void call() throws IgniteException { GridCacheAdapter cache = ((GridKernal) ignite).context().cache().internalCache(cacheName); assert cache != null; - cache.context().dataStructures().removeSetData(setId, topVer); + try { + cache.context().dataStructures().removeSetData(setId, topVer); + } + catch (IgniteCheckedException e) { + throw U.wrap(e); + } return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetImpl.java index 9e6964c..3aef490 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetImpl.java @@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.cache.datastructures; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.cache.datastructures.*; @@ -260,66 +259,56 @@ public class GridCacheSetImpl<T> extends AbstractCollection<T> implements GridCa /** {@inheritDoc} */ @Override public boolean retainAll(Collection<?> c) { - try { - onAccess(); + onAccess(); - try (GridCloseableIterator<T> iter = iterator0()) { - boolean rmv = false; + try (GridCloseableIterator<T> iter = iterator0()) { + boolean rmv = false; - Set<GridCacheSetItemKey> rmvKeys = null; + Set<GridCacheSetItemKey> rmvKeys = null; - for (T val : iter) { - if (!c.contains(val)) { - rmv = true; + for (T val : iter) { + if (!c.contains(val)) { + rmv = true; - if (rmvKeys == null) - rmvKeys = U.newHashSet(BATCH_SIZE); + if (rmvKeys == null) + rmvKeys = U.newHashSet(BATCH_SIZE); - rmvKeys.add(itemKey(val)); + rmvKeys.add(itemKey(val)); - if (rmvKeys.size() == BATCH_SIZE) { - retryRemoveAll(rmvKeys); + if (rmvKeys.size() == BATCH_SIZE) { + retryRemoveAll(rmvKeys); - rmvKeys.clear(); - } + rmvKeys.clear(); } } + } - if (!F.isEmpty(rmvKeys)) - retryRemoveAll(rmvKeys); + if (!F.isEmpty(rmvKeys)) + retryRemoveAll(rmvKeys); - return rmv; - } - } - catch (IgniteCheckedException e) { - throw new IgniteException(e); + return rmv; } } /** {@inheritDoc} */ @Override public void clear() { - try { - onAccess(); + onAccess(); - try (GridCloseableIterator<T> iter = iterator0()) { - Collection<GridCacheSetItemKey> rmvKeys = new ArrayList<>(BATCH_SIZE); + try (GridCloseableIterator<T> iter = iterator0()) { + Collection<GridCacheSetItemKey> rmvKeys = new ArrayList<>(BATCH_SIZE); - for (T val : iter) { - rmvKeys.add(itemKey(val)); + for (T val : iter) { + rmvKeys.add(itemKey(val)); - if (rmvKeys.size() == BATCH_SIZE) { - retryRemoveAll(rmvKeys); + if (rmvKeys.size() == BATCH_SIZE) { + retryRemoveAll(rmvKeys); - rmvKeys.clear(); - } + rmvKeys.clear(); } - - if (!rmvKeys.isEmpty()) - retryRemoveAll(rmvKeys); } - } - catch (IgniteCheckedException e) { - throw new IgniteException(e); + + if (!rmvKeys.isEmpty()) + retryRemoveAll(rmvKeys); } } @@ -437,14 +426,8 @@ public class GridCacheSetImpl<T> extends AbstractCollection<T> implements GridCa this.rmvd = rmvd; if (rmvd) { - for (GridCacheQueryFuture<?> fut : itFuts.values()) { - try { - fut.cancel(); - } - catch (IgniteCheckedException e) { - log.error("Failed to close iterator.", e); - } - } + for (GridCacheQueryFuture<?> fut : itFuts.values()) + fut.cancel(); itFuts.clear(); } @@ -471,7 +454,7 @@ public class GridCacheSetImpl<T> extends AbstractCollection<T> implements GridCa if (fut != null) fut.cancel(); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { log.error("Failed to close iterator.", e); } } @@ -579,9 +562,8 @@ public class GridCacheSetImpl<T> extends AbstractCollection<T> implements GridCa } /** {@inheritDoc} */ - @Override protected void onClose() throws IgniteCheckedException { + @Override protected void onClose() throws IgniteException { fut.cancel(); - clearWeakReference(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index c13f8f4..401e989 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@ -505,7 +505,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap res.entries(entries); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed processing get request: " + req, e); res.error(e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java index be4153a..2a59967 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -864,7 +864,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo cctx.io().send(n, req); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException | IgniteException e) { // Fail the whole thing. if (e instanceof ClusterTopologyException) fut.onResult((ClusterTopologyException)e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java index 69500dd..bbd9b42 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java @@ -828,7 +828,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach // Check for error. f.get(); } - catch (IgniteCheckedException e1) { + catch (IgniteException e1) { resp.error(e1); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java index 2e9311d..9a3caee 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java @@ -332,7 +332,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur else fut.onDone(); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException | IgniteException e) { // Fail the whole thing. if (e instanceof ClusterTopologyException) fut.onResult((ClusterTopologyException)e); @@ -389,7 +389,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur else fut.onDone(); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException | IgniteException e) { // Fail the whole thing. if (e instanceof ClusterTopologyException) fut.onResult((ClusterTopologyException)e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java index b53c1c8..3d4e983 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java @@ -572,7 +572,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements try { f.get(); // Check for errors of a parent future. } - catch (IgniteCheckedException e) { + catch (IgniteException e) { if (log.isDebugEnabled()) log.debug("Failed to prepare or rollback transaction [tx=" + this + ", e=" + e + ']'); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index f872cf9..7bcfae3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -409,7 +409,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu catch (GridInterruptedException e) { onError(new IgniteCheckedException("Got interrupted while waiting for replies to be sent.", e)); } - catch (IgniteCheckedException ignored) { + catch (IgniteException ignored) { // No-op, get() was just synchronization. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java index f79bc2f..a5a4d7a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java @@ -352,7 +352,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M try { cctx.io().send(n, req); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException | IgniteException e) { // Fail the whole thing. if (e instanceof ClusterTopologyException) fut.onResult((ClusterTopologyException)e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index c028efd..1367385 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -556,7 +556,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte return lockAllAsync0(cacheCtx, tx, threadId, ver, topVer, keys, txRead, timeout, filter); } - catch (IgniteCheckedException e) { + catch (IgniteException e) { return new GridFinishedFuture<>(ctx.kernalContext(), e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java index d041d0f..6b3bec9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java @@ -254,7 +254,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec cctx.io().send(n, req); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException | IgniteException e) { // Fail the whole thing. if (e instanceof ClusterTopologyException) fut.onResult((ClusterTopologyException)e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java index ac0b7e6..5adb9c3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java @@ -830,7 +830,7 @@ public class GridDhtPartitionDemandPool<K, V> { return; } - catch (IgniteCheckedException e) { + catch (IgniteException e) { throw new Error("Ordered preload future should never fail: " + e.getMessage(), e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 0a95411..336dcf1 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -764,7 +764,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon ", fut=" + this + ']'); } } - catch (IgniteCheckedException e) { + catch (IgniteException e) { U.error(log, "Failed to initialize exchange future: " + this, e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java index 6e1f494..2770860 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java @@ -355,7 +355,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma try { cctx.io().send(n, req); } - catch (IgniteCheckedException e) { + catch (IgniteCheckedException | IgniteException e) { // Fail the whole thing. if (e instanceof ClusterTopologyException) fut.onResult((ClusterTopologyException)e); @@ -791,13 +791,13 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma private long topVer; /** Exception cause. */ - private IgniteCheckedException e; + private IgniteException e; /** * @param timeout Timeout. * @param topVer Topology version timeout was created on. */ - private RemapTimeoutObject(long timeout, long topVer, IgniteCheckedException e) { + private RemapTimeoutObject(long timeout, long topVer, IgniteException e) { super(timeout); this.topVer = topVer;
