Repository: incubator-ignite Updated Branches: refs/heads/ignite-54-55 94768472d -> cb8a33466
# IGNITE-54-55 Fix compilation error. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb8a3346 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb8a3346 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb8a3346 Branch: refs/heads/ignite-54-55 Commit: cb8a33466e9790221778d756f46993667e827667 Parents: 9476847 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Tue Feb 3 15:15:22 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Tue Feb 3 15:15:22 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheAdapter.java | 6 +++--- .../processors/dataload/GridDataLoadCacheUpdaters.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb8a3346/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 76e7061..4904e28 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -3400,7 +3400,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, // Send job to all nodes. Collection<ClusterNode> nodes = ctx.grid().forCache(name()).nodes(); - IgniteFuture<Object> fut = null; + IgniteInternalFuture<Object> fut = null; if (!nodes.isEmpty()) fut = ctx.closures().callAsyncNoFailover(BROADCAST, new GlobalRemoveAllCallable<>(name(), topVer, REMOVE_ALL_BATCH_SIZE), nodes, true); @@ -3414,7 +3414,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, if (log.isDebugEnabled()) log.debug("All remote nodes left while cache remove [cacheName=" + name() + "]"); } - catch (ComputeTaskTimeoutException e) { + catch (ComputeTaskTimeoutCheckedException e) { U.warn(log, "Timed out waiting for remote nodes to finish cache remove (consider increasing " + "'networkTimeout' configuration property) [cacheName=" + name() + "]"); @@ -5250,7 +5250,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, @Override public Object call() throws Exception { Set<K> keys = new HashSet<>(); - final GridKernal grid = (GridKernal) ignite; + final IgniteKernal grid = (IgniteKernal) ignite; final GridCache<K,V> cache = grid.cachex(cacheName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb8a3346/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java index be417f5..9f15572 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java @@ -100,7 +100,7 @@ public class GridDataLoadCacheUpdaters { * @param putMap Entries to put. * @throws IgniteException If failed. */ - protected static <K, V> void updateAll(IgniteCache<K, V> cache, @Nullable Collection<K> rmvCol, + protected static <K, V> void updateAll(IgniteCache<K, V> cache, @Nullable Set<K> rmvCol, Map<K, V> putMap) { assert rmvCol != null || putMap != null;
