You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/12 08:15:09 UTC
[31/64] [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/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index eb4c2d9..c13f8f4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -9,8 +9,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+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.*;
@@ -104,7 +104,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
}
/** {@inheritDoc} */
- @Override public void onKernalStart() throws GridException {
+ @Override public void onKernalStart() throws IgniteCheckedException {
super.onKernalStart();
preldr.onKernalStart();
@@ -164,13 +164,13 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
* Starts multi-update lock. Will wait for topology future is ready.
*
* @return Topology version.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public long beginMultiUpdate() throws GridException {
+ public long beginMultiUpdate() throws IgniteCheckedException {
IgniteBiTuple<IgniteUuid, GridDhtTopologyFuture> tup = multiTxHolder.get();
if (tup != null)
- throw new GridException("Nested multi-update locks are not supported");
+ throw new IgniteCheckedException("Nested multi-update locks are not supported");
top.readLock();
@@ -206,13 +206,13 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
/**
* Ends multi-update lock.
*
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public void endMultiUpdate() throws GridException {
+ public void endMultiUpdate() throws IgniteCheckedException {
IgniteBiTuple<IgniteUuid, GridDhtTopologyFuture> tup = multiTxHolder.get();
if (tup == null)
- throw new GridException("Multi-update was not started or released twice.");
+ throw new IgniteCheckedException("Multi-update was not started or released twice.");
top.readLock();
@@ -336,7 +336,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
}
/** {@inheritDoc} */
- @Override public void loadCache(final IgniteBiPredicate<K, V> p, final long ttl, Object[] args) throws GridException {
+ @Override public void loadCache(final IgniteBiPredicate<K, V> p, final long ttl, Object[] args) throws IgniteCheckedException {
if (ctx.store().isLocalStore()) {
super.loadCache(p, ttl, args);
@@ -374,8 +374,8 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
entry.initialValue(val, null, ver0, ttl, -1, false, topVer, replicate ? DR_LOAD : DR_NONE);
}
- catch (GridException e) {
- throw new GridRuntimeException("Failed to put cache value: " + entry, e);
+ catch (IgniteCheckedException e) {
+ throw new IgniteException("Failed to put cache value: " + entry, e);
}
catch (GridCacheEntryRemovedException ignore) {
if (log.isDebugEnabled())
@@ -441,7 +441,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
/** {@inheritDoc} */
@Override public V reload(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter)
- throws GridException {
+ throws IgniteCheckedException {
try {
return super.reload(key, filter);
}
@@ -505,7 +505,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
res.entries(entries);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed processing get request: " + req, e);
res.error(e);
@@ -516,7 +516,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
try {
ctx.io().send(nodeId, res);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to send get response to node (is node still alive?) [nodeId=" + nodeId +
",req=" + req + ", res=" + res + ']', e);
}
@@ -581,8 +581,8 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
// Cannot use remove(key, val) since we may be in DHT cache and should go through near.
return entry(key).remove(val);
}
- catch (GridException e) {
- throw new GridRuntimeException(e);
+ catch (IgniteCheckedException e) {
+ throw new IgniteException(e);
}
}
@@ -640,7 +640,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
try {
part.onDeferredDelete(entry.key(), ver);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to enqueue deleted entry [key=" + entry.key() + ", ver=" + ver + ']', e);
}
}
@@ -677,7 +677,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
}
/** {@inheritDoc} */
- @Override public GridCacheEntry<K, V> nextX() throws GridException {
+ @Override public GridCacheEntry<K, V> nextX() throws IgniteCheckedException {
if (!hasNext())
throw new NoSuchElementException();
@@ -689,7 +689,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
}
/** {@inheritDoc} */
- @Override public void removeX() throws GridException {
+ @Override public void removeX() throws IgniteCheckedException {
if (last == null)
throw new IllegalStateException();
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/GridDhtCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheEntry.java
index 45912b3..be2596d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheEntry.java
@@ -9,16 +9,16 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.grid.util.lang.*;
import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
import java.util.*;
@@ -67,7 +67,7 @@ public class GridDhtCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> {
}
/** {@inheritDoc} */
- @Override public int memorySize() throws GridException {
+ @Override public int memorySize() throws IgniteCheckedException {
int rdrsOverhead = 0;
synchronized (this) {
@@ -499,9 +499,9 @@ public class GridDhtCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> {
* @param ver Obsolete version.
* @param swap If {@code true} then remove from swap.
* @return {@code True} if entry was not being used, passed the filter and could be removed.
- * @throws GridException If failed to remove from swap.
+ * @throws IgniteCheckedException If failed to remove from swap.
*/
- public boolean clearInternal(GridCacheVersion ver, boolean swap) throws GridException {
+ public boolean clearInternal(GridCacheVersion ver, boolean swap) throws IgniteCheckedException {
boolean rmv = false;
try {
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/GridDhtCacheEntryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheEntryImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheEntryImpl.java
index 7136119..094df1b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheEntryImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheEntryImpl.java
@@ -9,8 +9,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.typedef.*;
@@ -20,8 +20,8 @@ import org.jetbrains.annotations.*;
import java.io.*;
import java.util.*;
-import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;
import static org.gridgain.grid.cache.GridCachePeekMode.*;
+import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;
/**
* Colocated cache entry public API.
@@ -59,7 +59,7 @@ public class GridDhtCacheEntryImpl<K, V> extends GridCacheEntryImpl<K, V> {
}
/** {@inheritDoc} */
- @Override public V peek(@Nullable Collection<GridCachePeekMode> modes) throws GridException {
+ @Override public V peek(@Nullable Collection<GridCachePeekMode> modes) throws IgniteCheckedException {
if (!ctx.isNear() && !ctx.isReplicated() && modes.contains(NEAR_ONLY))
return null;
@@ -82,9 +82,9 @@ public class GridDhtCacheEntryImpl<K, V> extends GridCacheEntryImpl<K, V> {
try {
return peekDht0(SMART, filter);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
// Should never happen.
- throw new GridRuntimeException("Unable to perform entry peek() operation.", e);
+ throw new IgniteException("Unable to perform entry peek() operation.", e);
}
}
@@ -92,10 +92,10 @@ public class GridDhtCacheEntryImpl<K, V> extends GridCacheEntryImpl<K, V> {
* @param modes Peek modes.
* @param filter Optional entry filter.
* @return Peeked value.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
@Nullable private V peekDht0(@Nullable Collection<GridCachePeekMode> modes,
- @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException {
+ @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException {
if (F.isEmpty(modes))
return peekDht0(SMART, filter);
@@ -115,11 +115,11 @@ public class GridDhtCacheEntryImpl<K, V> extends GridCacheEntryImpl<K, V> {
* @param mode Peek mode.
* @param filter Optional entry filter.
* @return Peeked value.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
@SuppressWarnings({"unchecked"})
@Nullable private V peekDht0(@Nullable GridCachePeekMode mode,
- @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException {
+ @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException {
if (mode == null)
mode = SMART;
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/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index b84eaf38..b77bae2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -223,9 +223,9 @@ public class GridDhtLocalPartition<K, V> implements Comparable<GridDhtLocalParti
/**
* @param key Removed key.
* @param ver Removed version.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public void onDeferredDelete(K key, GridCacheVersion ver) throws GridException {
+ public void onDeferredDelete(K key, GridCacheVersion ver) throws IgniteCheckedException {
try {
T2<K, GridCacheVersion> evicted = rmvQueue.add(new T2<>(key, ver));
@@ -492,7 +492,7 @@ public class GridDhtLocalPartition<K, V> implements Comparable<GridDhtLocalParti
}
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to clear swap for evicted partition: " + this, e);
}
}
@@ -539,7 +539,7 @@ public class GridDhtLocalPartition<K, V> implements Comparable<GridDhtLocalParti
}
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to clear cache entry for evicted partition: " + cached, 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/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 3c47ffe..be4153a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -588,7 +588,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
return true;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
onError(e);
return false;
@@ -864,7 +864,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
cctx.io().send(n, req);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
// Fail the whole thing.
if (e instanceof ClusterTopologyException)
fut.onResult((ClusterTopologyException)e);
@@ -929,7 +929,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
catch (ClusterTopologyException e) {
fut.onResult(e);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
onError(e);
break; // For
@@ -946,10 +946,10 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
* @param req Request.
* @param e Entry.
* @return Entry.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
private GridDhtCacheEntry<K, V> addOwned(GridDhtLockRequest<K, V> req, GridDhtCacheEntry<K, V> e)
- throws GridException {
+ throws IgniteCheckedException {
while (true) {
try {
GridCacheMvccCandidate<K> added = e.candidate(lockVer);
@@ -1152,7 +1152,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
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/GridDhtLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java
index b6d0ab2..0f115c1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -9,17 +9,17 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+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.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.util.direct.*;
import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.direct.*;
+import org.gridgain.grid.util.tostring.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
-import org.gridgain.grid.util.tostring.*;
import org.jetbrains.annotations.*;
import java.io.*;
@@ -182,9 +182,9 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
* @param key Key.
* @param keyBytes Key bytes.
* @param ctx Context.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public void addNearKey(K key, byte[] keyBytes, GridCacheSharedContext<K, V> ctx) throws GridException {
+ public void addNearKey(K key, byte[] keyBytes, GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException {
if (ctx.deploymentEnabled())
prepareObject(key, ctx);
@@ -210,7 +210,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
* @param drVer DR version.
* @param invalidateEntry Flag indicating whether node should attempt to invalidate reader.
* @param ctx Context.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
public void addDhtKey(
K key,
@@ -219,7 +219,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
@Nullable GridCacheVersion drVer,
boolean invalidateEntry,
GridCacheContext<K, V> ctx
- ) throws GridException {
+ ) throws IgniteCheckedException {
invalidateEntries.set(idx, invalidateEntry);
addKeyBytes(key, keyBytes, writeEntry, false, null, drVer, ctx);
@@ -283,7 +283,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<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);
assert F.isEmpty(nearKeys) || !F.isEmpty(nearKeyBytes);
@@ -293,7 +293,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<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 (nearKeys == null && nearKeyBytes != 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/GridDhtLockResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockResponse.java
index f7105c0..3a86b4e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockResponse.java
@@ -9,15 +9,15 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+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.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.util.direct.*;
import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.internal.*;
+import org.gridgain.grid.util.direct.*;
import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.internal.*;
import java.io.*;
import java.nio.*;
@@ -156,7 +156,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<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 (nearEvictedBytes == null && nearEvicted != null)
@@ -173,7 +173,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<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 (nearEvicted == null && nearEvictedBytes != 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/GridDhtPartitionTopology.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopology.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
index 0ebaf4f..698e42d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
@@ -9,8 +9,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
import org.gridgain.grid.util.tostring.*;
import org.jetbrains.annotations.*;
@@ -59,18 +59,18 @@ public interface GridDhtPartitionTopology<K, V> {
* Pre-initializes this topology.
*
* @param exchId Exchange ID for this pre-initialization.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public void beforeExchange(GridDhtPartitionExchangeId exchId) throws GridException;
+ public void beforeExchange(GridDhtPartitionExchangeId exchId) throws IgniteCheckedException;
/**
* Post-initializes this topology.
*
* @param exchId Exchange ID for this post-initialization.
* @return {@code True} if mapping was changed.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public boolean afterExchange(GridDhtPartitionExchangeId exchId) throws GridException;
+ public boolean afterExchange(GridDhtPartitionExchangeId exchId) throws IgniteCheckedException;
/**
* @param topVer Topology version at the time of creation.
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/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 65528c7..ffe847d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -99,9 +99,9 @@ class GridDhtPartitionTopologyImpl<K, V> implements GridDhtPartitionTopology<K,
* Waits for renting partitions.
*
* @return {@code True} if mapping was changed.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- private boolean waitForRent() throws GridException {
+ private boolean waitForRent() throws IgniteCheckedException {
boolean changed = false;
// Synchronously wait for all renting partitions to complete.
@@ -188,7 +188,7 @@ class GridDhtPartitionTopologyImpl<K, V> implements GridDhtPartitionTopology<K,
}
/** {@inheritDoc} */
- @Override public void beforeExchange(GridDhtPartitionExchangeId exchId) throws GridException {
+ @Override public void beforeExchange(GridDhtPartitionExchangeId exchId) throws IgniteCheckedException {
waitForRent();
ClusterNode loc = cctx.localNode();
@@ -352,7 +352,7 @@ class GridDhtPartitionTopologyImpl<K, V> implements GridDhtPartitionTopology<K,
}
/** {@inheritDoc} */
- @Override public boolean afterExchange(GridDhtPartitionExchangeId exchId) throws GridException {
+ @Override public boolean afterExchange(GridDhtPartitionExchangeId exchId) throws IgniteCheckedException {
boolean changed = waitForRent();
ClusterNode loc = cctx.localNode();
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/GridDhtTopologyFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTopologyFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTopologyFuture.java
index b33b1c2..cf3ad80 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTopologyFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTopologyFuture.java
@@ -9,8 +9,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.kernal.managers.discovery.*;
/**
@@ -30,7 +30,7 @@ public interface GridDhtTopologyFuture extends IgniteFuture<Long> {
* This method will block until the topology future is ready.
*
* @return Topology snapshot for particular topology version.
- * @throws GridException If topology future failed.
+ * @throws IgniteCheckedException If topology future failed.
*/
- public GridDiscoveryTopologySnapshot topologySnapshot() throws GridException;
+ public GridDiscoveryTopologySnapshot topologySnapshot() throws IgniteCheckedException;
}
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/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index c65cc45..69500dd 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -9,9 +9,9 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -64,7 +64,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
}
/** {@inheritDoc} */
- @Override public void start() throws GridException {
+ @Override public void start() throws IgniteCheckedException {
super.start();
preldr = new GridDhtPreloader<>(ctx);
@@ -116,14 +116,14 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
* @param req Request.
* @param res Response.
* @return Remote transaction.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
* @throws GridDistributedLockCancelledException If lock has been cancelled.
*/
@SuppressWarnings({"RedundantTypeArguments"})
@Nullable GridDhtTxRemote<K, V> startRemoteTx(UUID nodeId,
GridDhtLockRequest<K, V> req,
GridDhtLockResponse<K, V> res)
- throws GridException, GridDistributedLockCancelledException {
+ throws IgniteCheckedException, GridDistributedLockCancelledException {
List<K> keys = req.keys();
List<GridCacheTxEntry<K, V>> writes = req.writeEntries();
@@ -398,12 +398,12 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
fail = true;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
String err = "Failed processing DHT lock request: " + req;
U.error(log, err, e);
- res = new GridDhtLockResponse<>(ctx.cacheId(), req.version(), req.futureId(), req.miniId(), new GridException(err, e));
+ res = new GridDhtLockResponse<>(ctx.cacheId(), req.version(), req.futureId(), req.miniId(), new IgniteCheckedException(err, e));
fail = true;
}
@@ -431,7 +431,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
fail = true;
releaseAll = true;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to send lock reply to node (lock will not be acquired): " + nodeId, e);
fail = true;
@@ -779,7 +779,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
if (tx != null)
tx.rollback();
- return new GridDhtFinishedFuture<>(ctx.kernalContext(), new GridException(msg));
+ return new GridDhtFinishedFuture<>(ctx.kernalContext(), new IgniteCheckedException(msg));
}
tx.topologyVersion(req.topologyVersion());
@@ -828,7 +828,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
// Check for error.
f.get();
}
- catch (GridException e1) {
+ catch (IgniteCheckedException e1) {
resp.error(e1);
}
@@ -875,7 +875,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
});
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
String err = "Failed to unmarshal at least one of the keys for lock request message: " + req;
U.error(log, err, e);
@@ -884,13 +884,13 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
try {
tx.rollback();
}
- catch (GridException ex) {
+ catch (IgniteCheckedException ex) {
U.error(log, "Failed to rollback the transaction: " + tx, ex);
}
}
return new GridDhtFinishedFuture<>(ctx.kernalContext(),
- new GridException(err, e));
+ new IgniteCheckedException(err, e));
}
}
},
@@ -1025,7 +1025,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
return res;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to get value for lock reply message for node [node=" +
U.toShortString(nearNode) + ", req=" + req + ']', e);
@@ -1059,7 +1059,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
if (!nearNode.id().equals(ctx.nodeId()) && !X.hasCause(err, GridDistributedLockCancelledException.class))
ctx.io().send(nearNode, res);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to send lock reply to originating node (will rollback transaction) [node=" +
U.toShortString(nearNode) + ", req=" + req + ']', e);
@@ -1186,7 +1186,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
* @param readers Readers for this entry.
* @param dhtMap DHT map.
* @param nearMap Near map.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
private void map(UUID nodeId,
long topVer,
@@ -1194,7 +1194,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
Collection<UUID> readers,
Map<ClusterNode, List<T2<K, byte[]>>> dhtMap,
Map<ClusterNode, List<T2<K, byte[]>>> nearMap)
- throws GridException {
+ throws IgniteCheckedException {
Collection<ClusterNode> dhtNodes = ctx.dht().topology().nodes(cached.partition(), topVer);
ClusterNode primary = F.first(dhtNodes);
@@ -1234,12 +1234,12 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
* @param entry Entry.
* @param nodes Nodes.
* @param map Map.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
@SuppressWarnings( {"MismatchedQueryAndUpdateOfCollection"})
private void map(GridCacheEntryEx<K, V> entry,
@Nullable Iterable<? extends ClusterNode> nodes,
- Map<ClusterNode, List<T2<K, byte[]>>> map) throws GridException {
+ Map<ClusterNode, List<T2<K, byte[]>>> map) throws IgniteCheckedException {
if (nodes != null) {
for (ClusterNode n : nodes) {
List<T2<K, byte[]>> keys = map.get(n);
@@ -1347,7 +1347,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
if (log.isDebugEnabled())
log.debug("Received remove lock request for removed entry (will retry): " + entry);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to remove locks for keys: " + keys, e);
}
}
@@ -1384,7 +1384,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
if (log.isDebugEnabled())
log.debug("Node left while sending unlock request: " + n);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to send unlock request to node (will make best effort to complete): " + n, e);
}
}
@@ -1412,7 +1412,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
if (log.isDebugEnabled())
log.debug("Node left while sending unlock request: " + n);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to send unlock request to node (will make best effort to complete): " + n, e);
}
}
@@ -1422,9 +1422,9 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
/**
* @param key Key
* @param ver Version.
- * @throws GridException If invalidate failed.
+ * @throws IgniteCheckedException If invalidate failed.
*/
- private void invalidateNearEntry(K key, GridCacheVersion ver) throws GridException {
+ private void invalidateNearEntry(K key, GridCacheVersion ver) throws IgniteCheckedException {
GridCacheEntryEx<K, V> nearEntry = near().peekEx(key);
if (nearEntry != 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/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index b1ca8e4..2e9311d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -160,7 +160,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
try {
tx.rollback();
}
- catch (GridException ex) {
+ catch (IgniteCheckedException ex) {
U.error(log, "Failed to automatically rollback transaction: " + tx, ex);
}
}
@@ -174,7 +174,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
catch (GridCacheTxHeuristicException ignore) {
// Future should complete with GridCacheTxHeuristicException.
}
- catch (GridException err) {
+ catch (IgniteCheckedException err) {
U.error(log, "Failed to invalidate transaction: " + tx, err);
}
}
@@ -332,7 +332,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
else
fut.onDone();
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
// Fail the whole thing.
if (e instanceof ClusterTopologyException)
fut.onResult((ClusterTopologyException)e);
@@ -389,7 +389,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
else
fut.onDone();
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
// Fail the whole thing.
if (e instanceof ClusterTopologyException)
fut.onResult((ClusterTopologyException)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/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index dad6c70..c5db862 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -9,15 +9,15 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+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.kernal.processors.cache.distributed.*;
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.*;
@@ -244,7 +244,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
/** {@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 (nearWrites != null) {
@@ -258,7 +258,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
}
/** {@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 (nearWritesBytes != 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/GridDhtTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
index f0ad4da..b53c1c8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -9,24 +9,24 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
+import org.gridgain.grid.util.tostring.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
-import org.gridgain.grid.util.tostring.*;
import org.jetbrains.annotations.*;
import java.io.*;
import java.util.*;
import java.util.concurrent.atomic.*;
-import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;
import static org.gridgain.grid.cache.GridCacheTxState.*;
+import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;
/**
* Replicated user transaction.
@@ -300,7 +300,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
if (timedOut())
fut.onError(new GridCacheTxTimeoutException("Transaction timed out and was rolled back: " + this));
else
- fut.onError(new GridException("Invalid transaction state for prepare [state=" + state() +
+ fut.onError(new IgniteCheckedException("Invalid transaction state for prepare [state=" + state() +
", tx=" + this + ']'));
}
else
@@ -316,7 +316,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
if (!state(PREPARED)) {
setRollbackOnly();
- fut.onError(new GridException("Invalid transaction state for commit [state=" + state() +
+ fut.onError(new IgniteCheckedException("Invalid transaction state for commit [state=" + state() +
", tx=" + this + ']'));
return fut;
@@ -326,7 +326,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
return fut;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
fut.onError(e);
return fut;
@@ -385,7 +385,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
fut.onError(new GridCacheTxTimeoutException("Transaction timed out and was rolled back: " +
this));
else
- fut.onError(new GridException("Invalid transaction state for prepare [state=" + state() +
+ fut.onError(new IgniteCheckedException("Invalid transaction state for prepare [state=" + state() +
", tx=" + this + ']'));
}
else
@@ -418,7 +418,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
catch (GridCacheTxTimeoutException | GridCacheTxOptimisticException e) {
fut.onError(e);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
setRollbackOnly();
fut.onError(new GridCacheTxRollbackException("Failed to prepare transaction: " + this, e));
@@ -432,7 +432,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
fut.onError(e);
}
- catch (GridException e1) {
+ catch (IgniteCheckedException e1) {
U.error(log, "Failed to rollback transaction: " + this, e1);
}
}
@@ -464,7 +464,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
if (finish(true))
fut.finish();
else
- fut.onError(new GridException("Failed to commit transaction: " + CU.txString(this)));
+ fut.onError(new IgniteCheckedException("Failed to commit transaction: " + CU.txString(this)));
}
catch (GridCacheTxOptimisticException e) {
if (log.isDebugEnabled())
@@ -472,7 +472,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
fut.onError(e);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to prepare transaction: " + this, e);
fut.onError(e);
@@ -487,7 +487,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
if (finish(true))
fut.finish();
else
- fut.onError(new GridException("Failed to commit transaction: " +
+ fut.onError(new IgniteCheckedException("Failed to commit transaction: " +
CU.txString(GridDhtTxLocal.this)));
}
catch (GridCacheTxOptimisticException e) {
@@ -496,7 +496,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
fut.onError(e);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to prepare transaction: " + this, e);
fut.onError(e);
@@ -511,7 +511,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
if (finish(true))
fut.finish();
else
- fut.onError(new GridException("Failed to commit transaction: " + CU.txString(this)));
+ fut.onError(new IgniteCheckedException("Failed to commit transaction: " + CU.txString(this)));
}
catch (GridCacheTxOptimisticException e) {
if (log.isDebugEnabled())
@@ -519,7 +519,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
fut.onError(e);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to commit transaction: " + this, e);
fut.onError(e);
@@ -549,7 +549,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
if (finish(false) || state() == UNKNOWN)
fut.finish();
else
- fut.onError(new GridException("Failed to commit transaction: " + CU.txString(this)));
+ fut.onError(new IgniteCheckedException("Failed to commit transaction: " + CU.txString(this)));
}
catch (GridCacheTxOptimisticException e) {
if (log.isDebugEnabled())
@@ -557,7 +557,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
fut.onError(e);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to rollback transaction (will make the best effort to rollback remote nodes): " +
this, e);
@@ -572,7 +572,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
try {
f.get(); // Check for errors of a parent future.
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
if (log.isDebugEnabled())
log.debug("Failed to prepare or rollback transaction [tx=" + this + ", e=" + e + ']');
}
@@ -581,11 +581,11 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
if (finish(false) || state() == UNKNOWN)
fut.finish();
else
- fut.onError(new GridException("Failed to commit transaction: " +
+ fut.onError(new IgniteCheckedException("Failed to commit transaction: " +
CU.txString(GridDhtTxLocal.this)));
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to gracefully rollback transaction: " + CU.txString(GridDhtTxLocal.this),
e);
@@ -600,7 +600,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
/** {@inheritDoc} */
@SuppressWarnings({"CatchGenericClass", "ThrowableInstanceNeverThrown"})
- @Override public boolean finish(boolean commit) throws GridException {
+ @Override public boolean finish(boolean commit) throws IgniteCheckedException {
assert nearFinFutId != null || isInvalidate() || !commit || isSystemInvalidate() //|| !isNearEnabled(cctx) TODO GG-9141
|| onePhaseCommit() || state() == PREPARED :
"Invalid state [nearFinFutId=" + nearFinFutId + ", isInvalidate=" + isInvalidate() + ", commit=" + commit +
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/GridDhtTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
index 6966644..d594df3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
@@ -9,9 +9,9 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -384,9 +384,9 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
* @param msgId Message ID.
* @param e Entry to add.
* @return Future for active transactions for the time when reader was added.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- @Nullable public IgniteFuture<Boolean> addEntry(long msgId, GridCacheTxEntry<K, V> e) throws GridException {
+ @Nullable public IgniteFuture<Boolean> addEntry(long msgId, GridCacheTxEntry<K, V> e) throws IgniteCheckedException {
init();
GridCacheTxState state = state();
@@ -444,7 +444,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
GridCacheVersion dhtVer = cctx.mvcc().mappedVersion(explicit);
if (dhtVer == null)
- throw new GridException("Failed to find dht mapping for explicit entry version: " + entry);
+ throw new IgniteCheckedException("Failed to find dht mapping for explicit entry version: " + entry);
entry.explicitVersion(dhtVer);
}
@@ -486,7 +486,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
try {
checkValid();
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
return new GridFinishedFuture<>(cctx.kernalContext(), e);
}
@@ -568,7 +568,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
return obtainLockAsync(cacheCtx, ret, passedKeys, read, skipped, null);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
setRollbackOnly();
return new GridFinishedFuture<>(cctx.kernalContext(), e);
@@ -605,7 +605,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
return new GridEmbeddedFuture<>(
fut,
new PLC1<GridCacheReturn<V>>(ret) {
- @Override protected GridCacheReturn<V> postLock(GridCacheReturn<V> ret) throws GridException {
+ @Override protected GridCacheReturn<V> postLock(GridCacheReturn<V> ret) throws IgniteCheckedException {
if (log.isDebugEnabled())
log.debug("Acquired transaction lock on keys: " + passedKeys);
@@ -682,7 +682,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
/** {@inheritDoc} */
@SuppressWarnings({"CatchGenericClass", "ThrowableInstanceNeverThrown"})
- @Override public boolean finish(boolean commit) throws GridException {
+ @Override public boolean finish(boolean commit) throws IgniteCheckedException {
if (log.isDebugEnabled())
log.debug("Finishing dht local tx [tx=" + this + ", commit=" + commit + "]");
@@ -694,7 +694,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
GridCacheTxState state = state();
if (state != COMMITTING && state != COMMITTED)
- throw new GridException("Invalid transaction state for commit [state=" + state() +
+ throw new IgniteCheckedException("Invalid transaction state for commit [state=" + state() +
", tx=" + this + ']');
else {
if (log.isDebugEnabled())
@@ -713,7 +713,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
}
}
- GridException err = null;
+ IgniteCheckedException err = null;
// Commit to DB first. This way if there is a failure, transaction
// won't be committed.
@@ -723,7 +723,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
else
userRollback();
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
err = e;
commit = false;
@@ -749,7 +749,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
if (!state(COMMITTED)) {
state(UNKNOWN);
- throw new GridException("Invalid transaction state for commit: " + this);
+ throw new IgniteCheckedException("Invalid transaction state for commit: " + this);
}
}
}
@@ -757,7 +757,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
if (!state(ROLLED_BACK)) {
state(UNKNOWN);
- throw new GridException("Invalid transaction state for rollback: " + this);
+ throw new IgniteCheckedException("Invalid transaction state for rollback: " + this);
}
}
}
@@ -773,7 +773,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
protected abstract void clearPrepareFuture(GridDhtTxPrepareFuture<K, V> fut);
/** {@inheritDoc} */
- @Override public void rollback() throws GridException {
+ @Override public void rollback() throws IgniteCheckedException {
try {
rollbackAsync().get();
}
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/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 8cee847..f872cf9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -265,7 +265,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
// try {
// tx.rollback();
// }
-// catch (GridException ex) {
+// catch (IgniteCheckedException ex) {
// U.error(log, "Failed to automatically rollback transaction: " + tx, ex);
// }
//
@@ -278,7 +278,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
try {
cctx.io().send(tx.nearNodeId(), res);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
U.error(log, "Failed to send reply to originating near node (will rollback): " + tx.nearNodeId(), e);
tx.rollbackAsync();
@@ -391,7 +391,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
return true;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
onError(e);
return true;
@@ -407,9 +407,9 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
get();
}
catch (GridInterruptedException e) {
- onError(new GridException("Got interrupted while waiting for replies to be sent.", e));
+ onError(new IgniteCheckedException("Got interrupted while waiting for replies to be sent.", e));
}
- catch (GridException ignored) {
+ catch (IgniteCheckedException ignored) {
// No-op, get() was just synchronization.
}
@@ -681,7 +681,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
catch (ClusterTopologyException e) {
fut.onResult(e);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
fut.onResult(e);
}
}
@@ -735,7 +735,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
catch (ClusterTopologyException e) {
fut.onResult(e);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
fut.onResult(e);
}
}
@@ -1032,7 +1032,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
break;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
// Fail the whole thing.
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/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index e14590e..61dfe70 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -9,15 +9,15 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+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.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.util.direct.*;
import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.internal.*;
+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.*;
@@ -260,7 +260,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
/** {@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 (ownedBytes == null && owned != null) {
@@ -283,7 +283,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
}
/** {@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 (ownedBytes != null && owned == 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/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index e59c566..1ada909 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@ -9,14 +9,14 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+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.kernal.processors.cache.distributed.*;
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.*;
@@ -168,7 +168,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp
/** {@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 (nearEvictedBytes == null)
@@ -179,7 +179,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp
}
/** {@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);
// Unmarshal even if deployment is disabled, since we could get bytes initially.
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/GridDhtTxRemote.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java
index 2d2fd80..3bc41b2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java
@@ -9,8 +9,8 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
+import org.apache.ignite.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -243,9 +243,9 @@ public class GridDhtTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V>
/**
* @param entry Write entry.
* @param ldr Class loader.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public void addWrite(GridCacheTxEntry<K, V> entry, ClassLoader ldr) throws GridException {
+ public void addWrite(GridCacheTxEntry<K, V> entry, ClassLoader ldr) throws IgniteCheckedException {
entry.unmarshal(cctx, false, ldr);
GridCacheContext<K, V> cacheCtx = entry.context();
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/GridDhtUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
index acb012b..4a5a5a0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
@@ -9,7 +9,7 @@
package org.gridgain.grid.kernal.processors.cache.distributed.dht;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
@@ -70,9 +70,9 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K,
* @param key Key.
* @param keyBytes Key bytes.
* @param ctx Context.
- * @throws GridException If failed.
+ * @throws IgniteCheckedException If failed.
*/
- public void addNearKey(K key, byte[] keyBytes, GridCacheSharedContext<K, V> ctx) throws GridException {
+ public void addNearKey(K key, byte[] keyBytes, GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException {
if (ctx.deploymentEnabled())
prepareObject(key, ctx);
@@ -83,7 +83,7 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K,
}
/** {@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 (nearKeyBytes != 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/GridPartitionedGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index d342bb3..91a98c1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -353,7 +353,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
try {
cctx.io().send(n, req);
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
// Fail the whole thing.
if (e instanceof ClusterTopologyException)
fut.onResult((ClusterTopologyException)e);
@@ -455,7 +455,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
break;
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
onDone(e);
break;
@@ -508,7 +508,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
return map;
}
}
- catch (GridException e) {
+ catch (IgniteCheckedException e) {
// Fail.
onDone(e);
}
@@ -636,7 +636,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
if (rmtTopVer <= topVer) {
// Fail the whole get future.
- onDone(new GridException("Failed to process invalid partitions response (remote node reported " +
+ onDone(new IgniteCheckedException("Failed to process invalid partitions response (remote node reported " +
"invalid partitions but remote topology version does not differ from local) " +
"[topVer=" + topVer + ", rmtTopVer=" + rmtTopVer + ", invalidParts=" + invalidParts +
", nodeId=" + node.id() + ']'));
@@ -652,7 +652,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
topFut.listenAsync(new CIX1<IgniteFuture<Long>>() {
@SuppressWarnings("unchecked")
- @Override public void applyx(IgniteFuture<Long> fut) throws GridException {
+ @Override public void applyx(IgniteFuture<Long> fut) throws IgniteCheckedException {
long topVer = fut.get();
// This will append new futures to compound list.