# ignite-sprint-4 ignore absence of affinity history in GridNearCacheEntry.primaryNode
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8388ef25 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8388ef25 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8388ef25 Branch: refs/heads/ignite-218 Commit: 8388ef2544b33f1d84ce33f2000e21d1c094ec6e Parents: be79494 Author: sboikov <sboi...@gridgain.com> Authored: Mon Apr 13 14:34:49 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Apr 13 14:34:49 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/near/GridNearCacheEntry.java | 10 +++++++++- .../ignite/internal/util/future/GridCompoundFuture.java | 9 ++------- 2 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8388ef25/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java index b22f79f..dbc0780 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java @@ -628,12 +628,20 @@ public class GridNearCacheEntry extends GridDistributedCacheEntry { /** * @param nodeId Primary node ID. + * @param topVer Topology version. */ private void primaryNode(UUID nodeId, AffinityTopologyVersion topVer) { assert Thread.holdsLock(this); assert nodeId != null; - ClusterNode primary = cctx.affinity().primary(part, topVer); + ClusterNode primary = null; + + try { + primary = cctx.affinity().primary(part, topVer); + } + catch (IllegalStateException ignore) { + // Do not have affinity history. + } if (primary == null || !nodeId.equals(primary.id())) { this.topVer = -1L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8388ef25/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java index dcd6b9b..2064338 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java @@ -322,13 +322,8 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> { throw e; } } - catch (IgniteTxOptimisticCheckedException e) { - err.compareAndSet(null, e); - } - catch (ClusterTopologyCheckedException e) { - err.compareAndSet(null, e); - } - catch (IgniteFutureCancelledCheckedException e) { + catch (IgniteTxOptimisticCheckedException | IgniteFutureCancelledCheckedException | + ClusterTopologyCheckedException e) { err.compareAndSet(null, e); } catch (IgniteCheckedException e) {
