You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2014/12/11 14:54:39 UTC
[30/56] [abbrv] [partial] incubator-ignite git commit: Rename
GridException to IgniteCheckedException,
GridRuntimeException to IgniteException.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index a6bc796..144a586 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -9,10 +9,11 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.plugin.security.*;
import org.apache.ignite.portables.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.managers.communication.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -21,7 +22,6 @@ import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
import org.gridgain.grid.kernal.processors.cache.dr.*;
import org.gridgain.grid.kernal.processors.timeout.*;
-import org.apache.ignite.plugin.security.*;
import org.gridgain.grid.util.*;
import org.gridgain.grid.util.future.*;
import org.gridgain.grid.util.lang.*;
@@ -140,7 +140,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
/** {@inheritDoc} */
@SuppressWarnings({"IfMayBeConditional", "SimplifiableIfStatement"})
- @Override public void start() throws GridException {
+ @Override public void start() throws IgniteCheckedException {
resetMetrics();
preldr = new GridDhtPreloader<>(ctx);
@@ -229,7 +229,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public V peek(K key, @Nullable Collection<GridCachePeekMode> modes) throws GridException {
+ @Override public V peek(K key, @Nullable Collection<GridCachePeekMode> modes) throws IgniteCheckedException {
GridTuple<V> val = null;
if (ctx.isReplicated() || !modes.contains(NEAR_ONLY)) {
@@ -271,19 +271,19 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
/** {@inheritDoc} */
@Override public V put(K key, V val, @Nullable GridCacheEntryEx<K, V> cached, long ttl,
- @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException {
+ @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException {
return putAsync(key, val, cached, ttl, filter).get();
}
/** {@inheritDoc} */
@Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx<K, V> cached,
- long ttl, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException {
+ long ttl, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException {
return putxAsync(key, val, cached, ttl, filter).get();
}
/** {@inheritDoc} */
@Override public boolean putx(K key, V val,
- IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException {
+ IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException {
return putxAsync(key, val, filter).get();
}
@@ -302,7 +302,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public V putIfAbsent(K key, V val) throws GridException {
+ @Override public V putIfAbsent(K key, V val) throws IgniteCheckedException {
return putIfAbsentAsync(key, val).get();
}
@@ -312,7 +312,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public boolean putxIfAbsent(K key, V val) throws GridException {
+ @Override public boolean putxIfAbsent(K key, V val) throws IgniteCheckedException {
return putxIfAbsentAsync(key, val).get();
}
@@ -322,7 +322,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public V replace(K key, V val) throws GridException {
+ @Override public V replace(K key, V val) throws IgniteCheckedException {
return replaceAsync(key, val).get();
}
@@ -332,7 +332,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public boolean replacex(K key, V val) throws GridException {
+ @Override public boolean replacex(K key, V val) throws IgniteCheckedException {
return replacexAsync(key, val).get();
}
@@ -342,7 +342,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public boolean replace(K key, V oldVal, V newVal) throws GridException {
+ @Override public boolean replace(K key, V oldVal, V newVal) throws IgniteCheckedException {
return replaceAsync(key, oldVal, newVal).get();
}
@@ -352,12 +352,12 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public GridCacheReturn<V> removex(K key, V val) throws GridException {
+ @Override public GridCacheReturn<V> removex(K key, V val) throws IgniteCheckedException {
return removexAsync(key, val).get();
}
/** {@inheritDoc} */
- @Override public GridCacheReturn<V> replacex(K key, V oldVal, V newVal) throws GridException {
+ @Override public GridCacheReturn<V> replacex(K key, V oldVal, V newVal) throws IgniteCheckedException {
return replacexAsync(key, oldVal, newVal).get();
}
@@ -376,7 +376,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
/** {@inheritDoc} */
@Override public void putAll(Map<? extends K, ? extends V> m,
- IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException {
+ IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException {
putAllAsync(m, filter).get();
}
@@ -387,7 +387,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public void putAllDr(Map<? extends K, GridCacheDrInfo<V>> drMap) throws GridException {
+ @Override public void putAllDr(Map<? extends K, GridCacheDrInfo<V>> drMap) throws IgniteCheckedException {
putAllDrAsync(drMap).get();
}
@@ -399,13 +399,13 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public void transform(K key, IgniteClosure<V, V> transformer) throws GridException {
+ @Override public void transform(K key, IgniteClosure<V, V> transformer) throws IgniteCheckedException {
transformAsync(key, transformer).get();
}
/** {@inheritDoc} */
@Override public <R> R transformAndCompute(K key, IgniteClosure<V, IgniteBiTuple<V, R>> transformer)
- throws GridException {
+ throws IgniteCheckedException {
return (R)updateAllAsync0(null,
Collections.singletonMap(key, new GridCacheTransformComputeClosure<>(transformer)), null, null, true,
false, null, 0, null).get();
@@ -419,7 +419,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public void transformAll(@Nullable Map<? extends K, ? extends IgniteClosure<V, V>> m) throws GridException {
+ @Override public void transformAll(@Nullable Map<? extends K, ? extends IgniteClosure<V, V>> m) throws IgniteCheckedException {
transformAllAsync(m).get();
}
@@ -433,7 +433,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
/** {@inheritDoc} */
@Override public V remove(K key, @Nullable GridCacheEntryEx<K, V> entry,
- @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException {
+ @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException {
return removeAsync(key, entry, filter).get();
}
@@ -446,7 +446,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
/** {@inheritDoc} */
@Override public void removeAll(Collection<? extends K> keys,
- IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException {
+ IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException {
removeAllAsync(keys, filter).get();
}
@@ -458,7 +458,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
/** {@inheritDoc} */
@Override public boolean removex(K key, @Nullable GridCacheEntryEx<K, V> entry,
- @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException {
+ @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException {
return removexAsync(key, entry, filter).get();
}
@@ -470,7 +470,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public boolean remove(K key, V val) throws GridException {
+ @Override public boolean remove(K key, V val) throws IgniteCheckedException {
return removeAsync(key, val).get();
}
@@ -480,7 +480,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public void removeAll(IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException {
+ @Override public void removeAll(IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException {
removeAllAsync(filter).get();
}
@@ -490,7 +490,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public void removeAllDr(Map<? extends K, GridCacheVersion> drMap) throws GridException {
+ @Override public void removeAllDr(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException {
removeAllDrAsync(drMap).get();
}
@@ -766,7 +766,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
break; // While.
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
return new GridFinishedFuture<>(ctx.kernalContext(), e);
}
finally {
@@ -1205,7 +1205,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
filtered.add(entry);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
res.addFailedKey(entry.key(), e);
}
catch (GridCacheFilterFailedException ignore) {
@@ -1432,7 +1432,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
retVal = new GridCacheReturn<>(req.returnValue() ? ret : null, updRes.success());
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
res.addFailedKey(k, e);
}
}
@@ -1645,7 +1645,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
res.addFailedKeys(putMap != null ? putMap.keySet() : rmvKeys, e);
}
@@ -1828,7 +1828,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
try {
return ctx.isAll(entry.wrapFilterLocked(), req.filter());
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
res.addFailedKey(entry.key(), e);
return false;
@@ -2082,8 +2082,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
catch (GridDhtInvalidPartitionException ignored) {
// Ignore.
}
- catch (GridException e) {
- res.addFailedKey(key, new GridException("Failed to update key on backup node: " + key, e));
+ catch (IgniteCheckedException e) {
+ res.addFailedKey(key, new IgniteCheckedException("Failed to update key on backup node: " + key, e));
}
}
@@ -2102,7 +2102,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
U.warn(log, "Failed to send DHT atomic update response to node because it left grid: " +
req.nodeId());
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to send DHT atomic update response (did node leave grid?) [nodeId=" + nodeId +
", req=" + req + ']', e);
}
@@ -2207,7 +2207,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
U.warn(log, "Failed to send near update reply to node because it left grid: " +
nodeId);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to send near update reply (did node leave grid?) [nodeId=" + nodeId +
", res=" + res + ']', e);
}
@@ -2482,7 +2482,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
log.debug("Failed to send deferred dht update response to remote node (did node leave grid?) " +
"[nodeId=" + nodeId + ", msg=" + msg + ']');
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to send deferred dht update response to remote node [nodeId="
+ nodeId + ", msg=" + msg + ']', e);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java
index 5c45a7c..3bdf7d9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCacheEntry.java
@@ -9,7 +9,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -54,7 +54,7 @@ public class GridDhtAtomicCacheEntry<K, V> extends GridDhtCacheEntry<K, V> {
}
/** {@inheritDoc} */
- @Override public GridCacheEntry<K, V> wrapFilterLocked() throws GridException {
+ @Override public GridCacheEntry<K, V> wrapFilterLocked() throws IgniteCheckedException {
assert Thread.holdsLock(this);
return new GridCacheFilterEvaluationEntry<>(key, rawGetOrUnmarshal(true), this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index 70aab97..982c777 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -159,7 +159,7 @@ public class GridDhtAtomicUpdateFuture<K, V> extends GridFutureAdapter<Void>
long mapTime0 = mapTime;
if (mapTime0 > 0 && U.currentTimeMillis() > mapTime0 + timeout) {
- GridException ex = new GridCacheAtomicUpdateTimeoutException("Cache update timeout out " +
+ IgniteCheckedException ex = new GridCacheAtomicUpdateTimeoutException("Cache update timeout out " +
"(consider increasing networkTimeout configuration property).");
updateRes.addFailedKeys(keys, ex);
@@ -327,7 +327,7 @@ public class GridDhtAtomicUpdateFuture<K, V> extends GridFutureAdapter<Void>
mappings.remove(req.nodeId());
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to send update request to backup node (did node leave the grid?): "
+ req.nodeId(), e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index 7ab9cf5..ad3f8da 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@ -9,15 +9,15 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.grid.util.*;
import org.gridgain.grid.util.direct.*;
import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
import java.io.*;
@@ -560,7 +560,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
/** {@inheritDoc}
* @param ctx*/
- @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException {
+ @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException {
super.prepareMarshal(ctx);
keyBytes = marshalCollection(keys, ctx);
@@ -577,7 +577,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
}
/** {@inheritDoc} */
- @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException {
+ @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException {
super.finishUnmarshal(ctx, ldr);
keys = unmarshalCollection(keyBytes, ctx, ldr);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index 3e22ba3..81b0a89 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -9,12 +9,12 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.direct.*;
-import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
import java.io.*;
@@ -44,7 +44,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im
/** Update error. */
@GridDirectTransient
- private GridException err;
+ private IgniteCheckedException err;
/** Serialized update error. */
private byte[] errBytes;
@@ -90,7 +90,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im
/**
* @return Gets update error.
*/
- public GridException error() {
+ public IgniteCheckedException error() {
return err;
}
@@ -114,7 +114,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im
failedKeys.add(key);
if (err == null)
- err = new GridException("Failed to update keys on primary node.");
+ err = new IgniteCheckedException("Failed to update keys on primary node.");
err.addSuppressed(e);
}
@@ -148,7 +148,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im
/** {@inheritDoc}
* @param ctx*/
- @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException {
+ @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException {
super.prepareMarshal(ctx);
failedKeysBytes = ctx.marshaller().marshal(failedKeys);
@@ -159,7 +159,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im
}
/** {@inheritDoc} */
- @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException {
+ @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException {
super.finishUnmarshal(ctx, ldr);
failedKeys = ctx.marshaller().unmarshal(failedKeysBytes, ldr);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 3a3eeef..d660112 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -429,8 +429,8 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object>
if (!remap && (cctx.config().getAtomicWriteOrderMode() == CLOCK || syncMode != FULL_ASYNC))
cctx.mvcc().addAtomicFuture(version(), this);
}
- catch (GridException e) {
- onDone(new GridException("Failed to get topology snapshot for update operation: " + this, e));
+ catch (IgniteCheckedException e) {
+ onDone(new IgniteCheckedException("Failed to get topology snapshot for update operation: " + this, e));
return;
}
@@ -746,7 +746,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object>
if (syncMode == FULL_ASYNC && cctx.config().getAtomicWriteOrderMode() == PRIMARY)
onDone(new GridCacheReturn<V>(null, true));
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
onDone(addFailedKeys(req.keys(), e));
}
}
@@ -777,7 +777,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object>
cctx.io().send(req.nodeId(), req);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
addFailedKeys(req.keys(), e);
removeMapping(req.nodeId());
@@ -821,7 +821,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object>
* @param err Error cause.
* @return Root {@link GridCachePartialUpdateException}.
*/
- private synchronized GridException addFailedKeys(Collection<K> failedKeys, Throwable err) {
+ private synchronized IgniteCheckedException addFailedKeys(Collection<K> failedKeys, Throwable err) {
GridCachePartialUpdateException err0 = this.err;
if (err0 == null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
index 9b76957..00512ff 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
@@ -9,15 +9,15 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.grid.util.*;
import org.gridgain.grid.util.direct.*;
import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
import java.io.*;
@@ -479,7 +479,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
/** {@inheritDoc}
* @param ctx*/
- @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException {
+ @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException {
super.prepareMarshal(ctx);
keyBytes = marshalCollection(keys, ctx);
@@ -488,7 +488,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
}
/** {@inheritDoc} */
- @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException {
+ @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException {
super.finishUnmarshal(ctx, ldr);
keys = unmarshalCollection(keyBytes, ctx, ldr);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
index d79bf0d..fe16214 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
@@ -9,12 +9,12 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.direct.*;
-import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
import java.io.*;
@@ -41,7 +41,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
/** Update error. */
@GridDirectTransient
- private volatile GridException err;
+ private volatile IgniteCheckedException err;
/** Serialized error. */
private byte[] errBytes;
@@ -291,7 +291,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
failedKeys.add(key);
if (err == null)
- err = new GridException("Failed to update keys on primary node.");
+ err = new IgniteCheckedException("Failed to update keys on primary node.");
err.addSuppressed(e);
}
@@ -309,14 +309,14 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
failedKeys.addAll(keys);
if (err == null)
- err = new GridException("Failed to update keys on primary node.");
+ err = new IgniteCheckedException("Failed to update keys on primary node.");
err.addSuppressed(e);
}
/** {@inheritDoc}
* @param ctx*/
- @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException {
+ @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException {
super.prepareMarshal(ctx);
if (err != null)
@@ -335,7 +335,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
}
/** {@inheritDoc} */
- @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException {
+ @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException {
super.finishUnmarshal(ctx, ldr);
if (errBytes != null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/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 96d837c..ae2a967 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
@@ -9,20 +9,20 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.plugin.security.*;
import org.apache.ignite.portables.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
-import org.apache.ignite.plugin.security.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.grid.util.future.*;
import org.gridgain.grid.util.lang.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
import java.io.*;
@@ -79,7 +79,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
}
/** {@inheritDoc} */
- @Override public void start() throws GridException {
+ @Override public void start() throws IgniteCheckedException {
super.start();
ctx.io().addHandler(ctx.cacheId(), GridNearGetResponse.class, new CI2<UUID, GridNearGetResponse<K, V>>() {
@@ -113,7 +113,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
}
/** {@inheritDoc} */
- @Override public V peek(K key, @Nullable Collection<GridCachePeekMode> modes) throws GridException {
+ @Override public V peek(K key, @Nullable Collection<GridCachePeekMode> modes) throws IgniteCheckedException {
GridTuple<V> val = null;
if (ctx.isReplicated() || !modes.contains(NEAR_ONLY)) {
@@ -284,7 +284,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
break; // While.
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
return new GridFinishedFuture<>(ctx.kernalContext(), e);
}
finally {
@@ -389,7 +389,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
if (!lock.reentry()) {
if (!ver.equals(lock.version()))
- throw new GridException("Failed to unlock (if keys were locked separately, " +
+ throw new IgniteCheckedException("Failed to unlock (if keys were locked separately, " +
"then they need to be unlocked separately): " + keys);
if (!primary.isLocal()) {
@@ -435,7 +435,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
ctx.io().send(n, req);
}
}
- catch (GridException ex) {
+ catch (IgniteCheckedException ex) {
U.error(log, "Failed to unlock the lock for keys: " + keys, ex);
}
}
@@ -518,7 +518,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
}
}
}
- catch (GridException ex) {
+ catch (IgniteCheckedException ex) {
U.error(log, "Failed to unlock the lock for keys: " + keys, ex);
}
}
@@ -557,7 +557,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
return lockAllAsync0(cacheCtx, tx, threadId, ver, topVer, keys, txRead, timeout, filter);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
return new GridFinishedFuture<>(ctx.kernalContext(), e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 9cb6ab9..d27ee3d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -245,9 +245,9 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
* @return Non-reentry candidate if lock should be acquired on remote node,
* reentry candidate if locks has been already acquired and {@code null} if explicit locks is held and
* implicit transaction accesses locked entry.
- * @throws GridException If failed to add entry due to external locking.
+ * @throws IgniteCheckedException If failed to add entry due to external locking.
*/
- @Nullable private GridCacheMvccCandidate<K> addEntry(GridDistributedCacheEntry<K, V> entry) throws GridException {
+ @Nullable private GridCacheMvccCandidate<K> addEntry(GridDistributedCacheEntry<K, V> entry) throws IgniteCheckedException {
GridCacheMvccCandidate<K> cand = cctx.mvcc().explicitLock(threadId, entry.key());
if (inTx()) {
@@ -257,7 +257,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
if (cand != null) {
if (!tx.implicit())
- throw new GridException("Cannot access key within transaction if lock is " +
+ throw new IgniteCheckedException("Cannot access key within transaction if lock is " +
"externally held [key=" + entry.key() + ", entry=" + entry + ']');
else
return null;
@@ -421,7 +421,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
return true;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
onError(e);
return false;
@@ -571,7 +571,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
cctx.topology().readUnlock();
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
onDone(e);
}
}
@@ -786,7 +786,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
proceedMapping(mappings);
}
- catch (GridException ex) {
+ catch (IgniteCheckedException ex) {
onDone(false, ex);
}
}
@@ -796,10 +796,10 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
* remote primary node.
*
* @param mappings Queue of mappings.
- * @throws GridException If mapping can not be completed.
+ * @throws IgniteCheckedException If mapping can not be completed.
*/
private void proceedMapping(final Deque<GridNearLockMapping<K, V>> mappings)
- throws GridException {
+ throws IgniteCheckedException {
GridNearLockMapping<K, V> map = mappings.poll();
// If there are no more mappings to process, complete the future.
@@ -854,7 +854,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
fut.onResult(ex);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
onError(e);
}
}
@@ -918,7 +918,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
if (mappings != null)
proceedMapping(mappings);
}
- catch (GridException ex) {
+ catch (IgniteCheckedException ex) {
onError(ex);
return false;
@@ -937,9 +937,9 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
* @param keys Keys to lock.
* @param topVer Topology version.
* @return {@code True} if all keys were mapped locally, {@code false} if full mapping should be performed.
- * @throws GridException If key cannot be added to mapping.
+ * @throws IgniteCheckedException If key cannot be added to mapping.
*/
- private boolean mapAsPrimary(Collection<? extends K> keys, long topVer) throws GridException {
+ private boolean mapAsPrimary(Collection<? extends K> keys, long topVer) throws IgniteCheckedException {
// Assign keys to primary nodes.
Collection<K> distributedKeys = new ArrayList<>(keys.size());
@@ -985,9 +985,9 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
* @param topVer Topology version.
* @param distributedKeys Collection of keys needs to be locked.
* @return {@code True} if transaction accesses key that was explicitly locked before.
- * @throws GridException If lock is externally held and transaction is explicit.
+ * @throws IgniteCheckedException If lock is externally held and transaction is explicit.
*/
- private boolean addLocalKey(K key, long topVer, Collection<K> distributedKeys) throws GridException {
+ private boolean addLocalKey(K key, long topVer, Collection<K> distributedKeys) throws IgniteCheckedException {
GridDistributedCacheEntry<K, V> entry = cctx.colocated().entryExx(key, topVer, false);
assert !entry.detached();
@@ -1014,10 +1014,10 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
* @param key Key to map.
* @param topVer Topology version.
* @return Near lock mapping.
- * @throws GridException If mapping failed.
+ * @throws IgniteCheckedException If mapping failed.
*/
private GridNearLockMapping<K, V> map(K key, @Nullable GridNearLockMapping<K, V> mapping,
- long topVer) throws GridException {
+ long topVer) throws IgniteCheckedException {
assert mapping == null || mapping.node() != null;
ClusterNode primary = cctx.affinity().primary(key, topVer);
@@ -1027,7 +1027,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
throw newTopologyException(null, primary.id());
if (inTx() && tx.groupLock() && !primary.isLocal())
- throw new GridException("Failed to start group lock transaction (local node is not primary for " +
+ throw new IgniteCheckedException("Failed to start group lock transaction (local node is not primary for " +
" key) [key=" + key + ", primaryNodeId=" + primary.id() + ']');
if (mapping == null || !primary.id().equals(mapping.node().id()))
@@ -1231,7 +1231,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
try {
if (res.dhtVersion(i) == null) {
- onDone(new GridException("Failed to receive DHT version from remote node " +
+ onDone(new IgniteCheckedException("Failed to receive DHT version from remote node " +
"(will fail the lock): " + res));
return;
@@ -1243,7 +1243,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
if (log.isDebugEnabled())
log.debug("Processed response for entry [res=" + res + ", entry=" + entry + ']');
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
onDone(e);
return;
@@ -1263,7 +1263,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
try {
proceedMapping(mappings);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
onDone(e);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java
index 1abd568..922f93b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtDetachedCacheEntry.java
@@ -9,7 +9,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import org.gridgain.grid.util.typedef.internal.*;
@@ -42,10 +42,10 @@ public class GridDhtDetachedCacheEntry<K, V> extends GridDistributedCacheEntry<K
* @param val Value.
* @param valBytes Value bytes.
* @param ver Version.
- * @throws GridException If value unmarshalling failed.
+ * @throws IgniteCheckedException If value unmarshalling failed.
*/
public void resetFromPrimary(V val, byte[] valBytes, GridCacheVersion ver)
- throws GridException {
+ throws IgniteCheckedException {
if (valBytes != null && val == null)
val = cctx.marshaller().unmarshal(valBytes, cctx.deploy().globalLoader());
@@ -55,7 +55,7 @@ public class GridDhtDetachedCacheEntry<K, V> extends GridDistributedCacheEntry<K
}
/** {@inheritDoc} */
- @Nullable @Override public V unswap(boolean ignoreFlags, boolean needVal) throws GridException {
+ @Nullable @Override public V unswap(boolean ignoreFlags, boolean needVal) throws IgniteCheckedException {
return null;
}
@@ -73,12 +73,12 @@ public class GridDhtDetachedCacheEntry<K, V> extends GridDistributedCacheEntry<K
/** {@inheritDoc} */
@Override protected void updateIndex(V val, byte[] valBytes, long expireTime,
- GridCacheVersion ver, V old) throws GridException {
+ GridCacheVersion ver, V old) throws IgniteCheckedException {
// No-op for detached entries, index is updated on primary nodes.
}
/** {@inheritDoc} */
- @Override protected void clearIndex(V val) throws GridException {
+ @Override protected void clearIndex(V val) throws IgniteCheckedException {
// No-op for detached entries, index is updated on primary or backup nodes.
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/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 9f7dde8..d041d0f 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 (GridException e) {
+ catch (IgniteCheckedException e) {
// Fail the whole thing.
if (e instanceof ClusterTopologyException)
fut.onResult((ClusterTopologyException)e);
@@ -508,7 +508,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
false, null, null, null);
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
onDone(e);
return;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
index ab7caec..3bd7d5e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
@@ -9,8 +9,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.direct.*;
@@ -131,7 +131,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem
/** {@inheritDoc}
* @param ctx*/
- @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException {
+ @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException {
super.prepareMarshal(ctx);
if (keyBytes == null)
@@ -139,7 +139,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem
}
/** {@inheritDoc} */
- @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException {
+ @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException {
super.finishUnmarshal(ctx, ldr);
if (keys == null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
index 7f76a0c..df1afec 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
@@ -9,13 +9,13 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.direct.*;
-import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.internal.*;
import java.io.*;
import java.nio.*;
@@ -129,7 +129,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple
/** {@inheritDoc}
* @param ctx*/
- @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException {
+ @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException {
super.prepareMarshal(ctx);
if (missedKeys != null && missedKeyBytes == null)
@@ -143,7 +143,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple
}
/** {@inheritDoc} */
- @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException {
+ @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException {
super.finishUnmarshal(ctx, ldr);
if (missedKeys == null && missedKeyBytes != null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
index 70f7f41..01ceb9d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
@@ -9,12 +9,12 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.direct.*;
-import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.internal.*;
import java.io.*;
import java.nio.*;
@@ -166,7 +166,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
/** {@inheritDoc}
* @param ctx*/
- @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException {
+ @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException {
super.prepareMarshal(ctx);
if (topic != null)
@@ -174,7 +174,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
}
/** {@inheritDoc} */
- @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException {
+ @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException {
super.finishUnmarshal(ctx, ldr);
if (topicBytes != null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/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 4885d6b..ac0b7e6 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
@@ -484,7 +484,7 @@ public class GridDhtPartitionDemandPool<K, V> {
* @throws GridInterruptedException If interrupted.
*/
private boolean preloadEntry(ClusterNode pick, int p, GridCacheEntryInfo<K, V> entry, long topVer)
- throws GridException, GridInterruptedException {
+ throws IgniteCheckedException, GridInterruptedException {
try {
GridCacheEntryEx<K, V> cached = null;
@@ -545,8 +545,8 @@ public class GridDhtPartitionDemandPool<K, V> {
catch (GridInterruptedException e) {
throw e;
}
- catch (GridException e) {
- throw new GridException("Failed to cache preloaded entry (will stop preloading) [local=" +
+ catch (IgniteCheckedException e) {
+ throw new IgniteCheckedException("Failed to cache preloaded entry (will stop preloading) [local=" +
cctx.nodeId() + ", node=" + pick.id() + ", key=" + entry.key() + ", part=" + p + ']', e);
}
@@ -569,10 +569,10 @@ public class GridDhtPartitionDemandPool<K, V> {
* @return Missed partitions.
* @throws InterruptedException If interrupted.
* @throws org.apache.ignite.cluster.ClusterTopologyException If node left.
- * @throws GridException If failed to send message.
+ * @throws IgniteCheckedException If failed to send message.
*/
private Set<Integer> demandFromNode(ClusterNode node, final long topVer, GridDhtPartitionDemandMessage<K, V> d,
- GridDhtPartitionsExchangeFuture<K, V> exchFut) throws InterruptedException, GridException {
+ GridDhtPartitionsExchangeFuture<K, V> exchFut) throws InterruptedException, IgniteCheckedException {
cntr++;
d.topic(topic(cntr));
@@ -830,7 +830,7 @@ public class GridDhtPartitionDemandPool<K, V> {
return;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
throw new Error("Ordered preload future should never fail: " + e.getMessage(), e);
}
}
@@ -915,7 +915,7 @@ public class GridDhtPartitionDemandPool<K, V> {
break; // For.
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to receive partitions from node (preloading will not " +
"fully finish) [node=" + node.id() + ", msg=" + d + ']', e);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
index 9a5116b..57c8e52 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
@@ -9,12 +9,12 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.direct.*;
-import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.internal.*;
import java.io.*;
import java.nio.*;
@@ -180,9 +180,9 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
* @param p Partition.
* @param info Entry to add.
* @param ctx Cache context.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- void addEntry(int p, GridCacheEntryInfo<K, V> info, GridCacheSharedContext<K, V> ctx) throws GridException {
+ void addEntry(int p, GridCacheEntryInfo<K, V> info, GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException {
assert info != null;
marshalInfo(info, ctx);
@@ -206,9 +206,9 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
* @param p Partition.
* @param info Entry to add.
* @param ctx Cache context.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- void addEntry0(int p, GridCacheEntryInfo<K, V> info, GridCacheSharedContext<K, V> ctx) throws GridException {
+ void addEntry0(int p, GridCacheEntryInfo<K, V> info, GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException {
assert info != null;
assert info.keyBytes() != null;
assert info.valueBytes() != null || info.value() instanceof byte[] :
@@ -234,14 +234,14 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
/** {@inheritDoc}
* @param ctx*/
- @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException {
+ @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException {
super.prepareMarshal(ctx);
infoBytes = ctx.marshaller().marshal(infoBytesMap);
}
/** {@inheritDoc} */
- @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException {
+ @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException {
super.finishUnmarshal(ctx, ldr);
infoBytesMap = ctx.marshaller().unmarshal(infoBytes, ldr);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
index cb53507..963ad4c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
@@ -482,7 +482,7 @@ class GridDhtPartitionSupplyPool<K, V> {
reply(node, d, s);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to send partition supply message to node: " + node.id(), e);
// Removing current topic because of request must fail with timeout and
@@ -500,10 +500,10 @@ class GridDhtPartitionSupplyPool<K, V> {
* @param d Demand message.
* @param s Supply message.
* @return {@code True} if message was sent, {@code false} if recipient left grid.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
private boolean reply(ClusterNode n, GridDhtPartitionDemandMessage<K, V> d, GridDhtPartitionSupplyMessage<K, V> s)
- throws GridException {
+ throws IgniteCheckedException {
try {
if (log.isDebugEnabled())
log.debug("Replying to partition demand [node=" + n.id() + ", demand=" + d + ", supply=" + s + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/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 e70ccdb..0a95411 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
@@ -231,7 +231,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
}
/** {@inheritDoc} */
- @Override public GridDiscoveryTopologySnapshot topologySnapshot() throws GridException {
+ @Override public GridDiscoveryTopologySnapshot topologySnapshot() throws IgniteCheckedException {
get();
if (topSnapshot.get() == null)
@@ -272,7 +272,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
/**
* Rechecks topology.
*/
- private void initTopology(GridCacheContext<K, V> cacheCtx) throws GridException {
+ private void initTopology(GridCacheContext<K, V> cacheCtx) throws IgniteCheckedException {
if (canCalculateAffinity(cacheCtx)) {
if (log.isDebugEnabled())
log.debug("Will recalculate affinity [locNodeId=" + cctx.localNodeId() + ", exchId=" + exchId + ']');
@@ -491,7 +491,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
throw e;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to reinitialize local partitions (preloading will be stopped): " + exchId, e);
onDone(e);
@@ -537,9 +537,9 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
/**
* @param node Node.
* @param id ID.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private void sendLocalPartitions(ClusterNode node, @Nullable GridDhtPartitionExchangeId id) throws GridException {
+ private void sendLocalPartitions(ClusterNode node, @Nullable GridDhtPartitionExchangeId id) throws IgniteCheckedException {
GridDhtPartitionsSingleMessage<K, V> m = new GridDhtPartitionsSingleMessage<>(id, cctx.versions().last());
for (GridCacheContext<K, V> cacheCtx : cctx.cacheContexts()) {
@@ -556,10 +556,10 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
/**
* @param nodes Nodes.
* @param id ID.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
private void sendAllPartitions(Collection<? extends ClusterNode> nodes, GridDhtPartitionExchangeId id)
- throws GridException {
+ throws IgniteCheckedException {
GridDhtPartitionsFullMessage<K, V> m = new GridDhtPartitionsFullMessage<>(id, lastVer.get(),
id.topologyVersion());
@@ -592,7 +592,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
log.debug("Oldest node left during partition exchange [nodeId=" + oldestNode.id() +
", exchId=" + exchId + ']');
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
scheduleRecheck();
U.error(log, "Failed to send local partitions to oldest node (will retry after timeout) [oldestNodeId=" +
@@ -609,7 +609,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
return true;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
scheduleRecheck();
U.error(log, "Failed to send full partition map to nodes (will retry after timeout) [nodes=" +
@@ -711,7 +711,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
if (n != null)
sendAllPartitions(F.asList(n), exchId);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
scheduleRecheck();
U.error(log, "Failed to send full partition map to node (will retry after timeout) [node=" + nodeId +
@@ -764,7 +764,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
", fut=" + this + ']');
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to initialize exchange future: " + this, e);
}
}
@@ -915,7 +915,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
for (GridCacheContext<K, V> cacheCtx : cctx.cacheContexts())
cacheCtx.topology().beforeExchange(exchId);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
onDone(e);
return;
@@ -988,7 +988,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
cctx.io().safeSend(cctx.discovery().nodes(remaining),
new GridDhtPartitionsSingleRequest<K, V>(exchId), null);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to request partitions from nodes [exchangeId=" + exchId +
", nodes=" + remaining + ']', e);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
index 94134ee..68ff1a4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
@@ -9,13 +9,13 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.direct.*;
-import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
import java.io.*;
@@ -84,7 +84,7 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac
/** {@inheritDoc}
* @param ctx*/
- @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException {
+ @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException {
super.prepareMarshal(ctx);
if (parts != null)
@@ -123,7 +123,7 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac
}
/** {@inheritDoc} */
- @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException {
+ @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException {
super.finishUnmarshal(ctx, ldr);
if (partsBytes != null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
index e1a9d82..350da08 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
@@ -9,12 +9,12 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.direct.*;
-import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
import java.io.*;
@@ -70,7 +70,7 @@ public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstr
/** {@inheritDoc}
* @param ctx*/
- @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException {
+ @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException {
super.prepareMarshal(ctx);
if (parts != null)
@@ -78,7 +78,7 @@ public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstr
}
/** {@inheritDoc} */
- @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException {
+ @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException {
super.finishUnmarshal(ctx, ldr);
if (partsBytes != null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index bb86d18..9706727 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -9,17 +9,17 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.kernal.managers.eventstorage.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.future.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
-import org.gridgain.grid.util.future.*;
import org.jdk8.backport.*;
import org.jetbrains.annotations.*;
@@ -153,7 +153,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public void onKernalStart() throws GridException {
+ @Override public void onKernalStart() throws IgniteCheckedException {
if (log.isDebugEnabled())
log.debug("DHT preloader onKernalStart callback.");
@@ -377,7 +377,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
log.debug("Received force key request form failed node (will ignore) [nodeId=" + node.id() +
", req=" + msg + ']');
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to reply to force key request [nodeId=" + node.id() + ", req=" + msg + ']', e);
}
finally {
@@ -430,7 +430,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
cctx.io().send(node,
new GridDhtAffinityAssignmentResponse<K, V>(cctx.cacheId(), topVer, assignment), AFFINITY_POOL);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to send affinity assignment response to remote node [node=" + node + ']', e);
}
}