Repository: ignite Updated Branches: refs/heads/ignite-950-new 2c7b230e8 -> 3ef78a3dc
IGNITE-950-new - Debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ef78a3d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ef78a3d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ef78a3d Branch: refs/heads/ignite-950-new Commit: 3ef78a3dc0d38c3cb95e9a91d3871076a76a0f82 Parents: 2c7b230 Author: Alexey Goncharuk <[email protected]> Authored: Sun Nov 1 15:18:13 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Sun Nov 1 15:18:13 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/affinity/GridAffinityAssignmentCache.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3ef78a3d/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java index 18776a4..63aea7b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java @@ -33,6 +33,7 @@ import org.apache.ignite.cache.affinity.AffinityFunction; import org.apache.ignite.cache.affinity.AffinityKeyMapper; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.events.DiscoveryEvent; +import org.apache.ignite.igniteobject.IgniteObject; import org.apache.ignite.internal.GridNodeOrderComparator; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.cache.CacheObject; @@ -368,7 +369,7 @@ public class GridAffinityAssignmentCache { * @return Affinity key. */ private Object affinityKey(Object key) { - if (key instanceof CacheObject) + if (key instanceof CacheObject && !(key instanceof IgniteObject)) key = ((CacheObject)key).value(ctx.cacheObjectContext(), false); return (key instanceof GridCacheInternal ? ctx.defaultAffMapper() : affMapper).affinityKey(key);
