Repository: incubator-ignite Updated Branches: refs/heads/ignite-26 [created] 52440dfb7
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index 433034d..4628bb7 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -1215,11 +1215,11 @@ public final class GridTestUtils { * @param retryInterval Interval between retries in milliseconds. * @param c Closure with assertion. All {@link AssertionError}s thrown * from this closure will be ignored {@code retries} times. - * @throws org.apache.ignite.IgniteInterruptedException If interrupted. + * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If interrupted. */ @SuppressWarnings("ErrorNotRethrown") public static void retryAssert(@Nullable IgniteLogger log, int retries, long retryInterval, GridAbsClosure c) - throws IgniteInterruptedException { + throws IgniteInterruptedCheckedException { for (int i = 0; i < retries; i++) { try { c.apply(); @@ -1272,9 +1272,9 @@ public final class GridTestUtils { * @param sleepDur Sleep duration in milliseconds. * @param i Integer to increment. * @return Incremented value. - * @throws org.apache.ignite.IgniteInterruptedException If sleep was interrupted. + * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If sleep was interrupted. */ - public static int sleepAndIncrement(int sleepDur, int i) throws IgniteInterruptedException { + public static int sleepAndIncrement(int sleepDur, int i) throws IgniteInterruptedCheckedException { U.sleep(sleepDur); return i + 1; @@ -1286,9 +1286,9 @@ public final class GridTestUtils { * @param cond Condition to wait for. * @param timeout Max time to wait in milliseconds. * @return {@code true} if condition was achieved, {@code false} otherwise. - * @throws org.apache.ignite.IgniteInterruptedException If interrupted. + * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If interrupted. */ - public static boolean waitForCondition(GridAbsPredicate cond, long timeout) throws IgniteInterruptedException { + public static boolean waitForCondition(GridAbsPredicate cond, long timeout) throws IgniteInterruptedCheckedException { long curTime = U.currentTimeMillis(); long endTime = curTime + timeout; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java index 78ce42e..f4a867b 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java @@ -62,6 +62,7 @@ public class IgniteLangSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridEmbeddedFutureSelfTest.class)); suite.addTest(new TestSuite(GridNioFutureSelfTest.class)); suite.addTest(new TestSuite(GridNioEmbeddedFutureSelfTest.class)); + suite.addTest(new TestSuite(IgniteFutureImplTest.class)); // Consistent hash tests. suite.addTest(new TestSuite(GridConsistentHashSelfTest.class)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIpcIo.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIpcIo.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIpcIo.java index 9214bc7..43311db 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIpcIo.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIpcIo.java @@ -278,7 +278,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo { reader = null; } - catch (IgniteInterruptedException ignored) { + catch (IgniteInterruptedCheckedException ignored) { Thread.currentThread().interrupt(); log.warn("Got interrupted while waiting for reader thread to shut down (will return)."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java index 54ef6c7..a38977a 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java @@ -411,7 +411,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable { snd.join(); } catch (InterruptedException e) { - throw new IgniteInterruptedException(e); + throw new IgniteInterruptedCheckedException(e); } } @@ -460,7 +460,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable { log.debug("Finished waiting for sending thread to complete on shuffle job flush: " + job.id()); } catch (InterruptedException e) { - throw new IgniteInterruptedException(e); + throw new IgniteInterruptedCheckedException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java index 994c9dd..ccf70bb 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.hadoop.taskexecutor; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.thread.*; import org.apache.ignite.hadoop.*; import org.apache.ignite.internal.util.worker.*; @@ -178,7 +179,7 @@ public class GridHadoopExecutorService { workerName = task.toString(); GridWorker w = new GridWorker(gridName, workerName, log, lsnr) { - @Override protected void body() throws InterruptedException, IgniteInterruptedException { + @Override protected void body() throws InterruptedException, IgniteInterruptedCheckedException { try { task.call(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2CleanupTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2CleanupTask.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2CleanupTask.java index 05ebe23..ef5c1f1 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2CleanupTask.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2CleanupTask.java @@ -21,6 +21,7 @@ import org.apache.hadoop.mapred.JobContextImpl; import org.apache.hadoop.mapreduce.*; import org.apache.ignite.*; import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.*; import java.io.*; @@ -64,7 +65,7 @@ public class GridHadoopV2CleanupTask extends GridHadoopV2Task { catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new IgniteInterruptedException(e); + throw new IgniteInterruptedCheckedException(e); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2MapTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2MapTask.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2MapTask.java index 2e625f3..5b66c41 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2MapTask.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2MapTask.java @@ -25,6 +25,7 @@ import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.util.*; import org.apache.ignite.*; import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.*; /** * Hadoop map task implementation for v2 API. @@ -89,7 +90,7 @@ public class GridHadoopV2MapTask extends GridHadoopV2Task { Thread.currentThread().interrupt(); - throw new IgniteInterruptedException(e); + throw new IgniteInterruptedCheckedException(e); } catch (Exception e) { err = e; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2ReduceTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2ReduceTask.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2ReduceTask.java index e59fb01..ac9c96d 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2ReduceTask.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2ReduceTask.java @@ -23,6 +23,7 @@ import org.apache.hadoop.mapreduce.lib.reduce.*; import org.apache.hadoop.util.*; import org.apache.ignite.*; import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.*; /** * Hadoop reduce task implementation for v2 API. @@ -71,7 +72,7 @@ public class GridHadoopV2ReduceTask extends GridHadoopV2Task { Thread.currentThread().interrupt(); - throw new IgniteInterruptedException(e); + throw new IgniteInterruptedCheckedException(e); } catch (Exception e) { err = e; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2SetupTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2SetupTask.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2SetupTask.java index 9218f36..09aaf5f 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2SetupTask.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2SetupTask.java @@ -21,6 +21,7 @@ import org.apache.hadoop.mapred.JobContextImpl; import org.apache.hadoop.mapreduce.*; import org.apache.ignite.*; import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.*; import java.io.*; @@ -58,7 +59,7 @@ public class GridHadoopV2SetupTask extends GridHadoopV2Task { catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new IgniteInterruptedException(e); + throw new IgniteInterruptedCheckedException(e); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2Splitter.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2Splitter.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2Splitter.java index e6c6911..1911488 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2Splitter.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2Splitter.java @@ -22,6 +22,7 @@ import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.util.*; import org.apache.ignite.*; import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.hadoop.*; import org.jetbrains.annotations.*; @@ -72,7 +73,7 @@ public class GridHadoopV2Splitter { catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new IgniteInterruptedException(e); + throw new IgniteInterruptedCheckedException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStore.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStore.java index 048ab0f..93c8b33 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStore.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/GridCacheHibernateBlobStore.java @@ -19,6 +19,7 @@ package org.apache.ignite.cache.store.hibernate; import org.apache.ignite.*; import org.apache.ignite.cache.store.*; +import org.apache.ignite.internal.*; import org.apache.ignite.resources.*; import org.apache.ignite.transactions.*; import org.apache.ignite.internal.util.typedef.*; @@ -511,7 +512,7 @@ public class GridCacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { try { U.await(initLatch); } - catch (IgniteInterruptedException e) { + catch (IgniteInterruptedCheckedException e) { throw new IgniteException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java index e305482..232ae2b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java @@ -17,13 +17,11 @@ package org.apache.ignite.internal.processors.query.h2; -import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; @@ -66,7 +64,7 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { try { U.sleep(Long.MAX_VALUE); } - catch (IgniteInterruptedException ignored) { + catch (IgniteInterruptedCheckedException ignored) { interrupted = true; } } @@ -233,7 +231,7 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { fut.get(); return null; } - }, IgniteFutureCancelledException.class, null); + }, IgniteFutureCancelledCheckedException.class, null); assertTrue(spi.interrupted); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala index e9e9f1d..0c2bd5b 100644 --- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala +++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala @@ -19,8 +19,8 @@ package org.apache.ignite.scalar.pimps import org.apache.ignite._ import org.apache.ignite.cluster.{ClusterGroup, ClusterGroupEmptyException, ClusterNode} -import org.apache.ignite.internal.IgniteInternalFuture -import org.apache.ignite.lang.{IgniteFutureCancelledException, IgnitePredicate} +import org.apache.ignite.internal.{IgniteFutureCancelledCheckedException, IgniteInterruptedCheckedException, IgniteInternalFuture} +import org.apache.ignite.lang.IgnitePredicate import org.jetbrains.annotations._ /** @@ -600,8 +600,8 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * Note that in case of dynamic projection this method will take a snapshot of all the * nodes at the time of this call, apply all filtering predicates, if any, and if the * resulting collection of nodes is empty - the exception will be thrown. - * @throws IgniteInterruptedException Subclass of `IgniteCheckedException` thrown if the wait was interrupted. - * @throws IgniteFutureCancelledException Subclass of `IgniteCheckedException` thrown if computation was cancelled. + * @throws IgniteInterruptedCheckedException Subclass of `IgniteCheckedException` thrown if the wait was interrupted. + * @throws IgniteFutureCancelledCheckedException Subclass of `IgniteCheckedException` thrown if computation was cancelled. */ def affinityRun$(cacheName: String, @Nullable affKey: Any, @Nullable r: Run, @Nullable p: NF) { affinityRunAsync$(cacheName, affKey, r, p).get @@ -645,8 +645,8 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * nodes at the time of this call, apply all filtering predicates, if any, and if the * resulting collection of nodes is empty - the exception will be thrown. * @return Non-cancellable future of this execution. - * @throws IgniteInterruptedException Subclass of `IgniteCheckedException` thrown if the wait was interrupted. - * @throws IgniteFutureCancelledException Subclass of `IgniteCheckedException` thrown if computation was cancelled. + * @throws IgniteInterruptedCheckedException Subclass of `IgniteCheckedException` thrown if the wait was interrupted. + * @throws IgniteFutureCancelledCheckedException Subclass of `IgniteCheckedException` thrown if computation was cancelled. */ def affinityRunAsync$(cacheName: String, @Nullable affKey: Any, @Nullable r: Run, @Nullable p: NF): IgniteInternalFuture[_] = { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java ---------------------------------------------------------------------- diff --git a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java index a4c91ca..71a26af 100644 --- a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java +++ b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java @@ -691,12 +691,12 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable { * Checks that the future is in valid state for get operation. * * @return Latch or {@code null} if future has been finished. - * @throws org.apache.ignite.lang.IgniteFutureCancelledException If was cancelled. + * @throws org.apache.ignite.internal.IgniteFutureCancelledCheckedException If was cancelled. */ - @Nullable private CountDownLatch ensureGet() throws IgniteFutureCancelledException { + @Nullable private CountDownLatch ensureGet() throws IgniteFutureCancelledCheckedException { synchronized (mux) { if (cancelled) - throw new IgniteFutureCancelledException("Scheduling has been cancelled: " + this); + throw new IgniteFutureCancelledCheckedException("Scheduling has been cancelled: " + this); if (done) return null; @@ -717,12 +717,12 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable { Thread.currentThread().interrupt(); if (isCancelled()) - throw new IgniteFutureCancelledException(e); + throw new IgniteFutureCancelledCheckedException(e); if (isDone()) return last(); - throw new IgniteInterruptedException(e); + throw new IgniteInterruptedCheckedException(e); } } @@ -743,19 +743,19 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R>, Externalizable { if (latch.await(timeout, unit)) return last(); else - throw new IgniteFutureTimeoutException("Timed out waiting for completion of next " + + throw new IgniteFutureTimeoutCheckedException("Timed out waiting for completion of next " + "scheduled computation: " + this); } catch (InterruptedException e) { Thread.currentThread().interrupt(); if (isCancelled()) - throw new IgniteFutureCancelledException(e); + throw new IgniteFutureCancelledCheckedException(e); if (isDone()) return last(); - throw new IgniteInterruptedException(e); + throw new IgniteInterruptedCheckedException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java index 7acbc5f..f2e873c 100644 --- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java +++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.util.nodestart; import com.jcraft.jsch.*; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.resources.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; @@ -196,7 +197,7 @@ public class GridNodeCallableImpl implements GridNodeCallable { return new GridTuple3<>(spec.host(), true, null); } - catch (IgniteInterruptedException e) { + catch (IgniteInterruptedCheckedException e) { return new GridTuple3<>(spec.host(), false, e.getMessage()); } catch (Exception e) { @@ -215,9 +216,9 @@ public class GridNodeCallableImpl implements GridNodeCallable { * @param cmd Command. * @throws JSchException In case of SSH error. * @throws IOException If IO error occurs. - * @throws org.apache.ignite.IgniteInterruptedException If thread was interrupted while waiting. + * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If thread was interrupted while waiting. */ - private void shell(Session ses, String cmd) throws JSchException, IOException, IgniteInterruptedException { + private void shell(Session ses, String cmd) throws JSchException, IOException, IgniteInterruptedCheckedException { ChannelShell ch = null; try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52440dfb/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java index 5feec7c..8e53860 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java @@ -19,6 +19,7 @@ package org.apache.ignite.spi.deployment.uri; import org.apache.ignite.*; import org.apache.ignite.compute.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.*; @@ -537,7 +538,7 @@ public class GridUriDeploymentSpi extends IgniteSpiAdapter implements Deployment try { U.sleep(10000); } - catch (IgniteInterruptedException ignored) { + catch (IgniteInterruptedCheckedException ignored) { // No-op }
