ignite-3300 Fixed potential race.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eddd0a98 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eddd0a98 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eddd0a98 Branch: refs/heads/ignite-3553 Commit: eddd0a981ead389bed5608444a811b1c90f4098f Parents: d88f778 Author: sboikov <[email protected]> Authored: Fri Jul 22 16:43:59 2016 +0300 Committer: sboikov <[email protected]> Committed: Fri Jul 22 16:43:59 2016 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheAffinityManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/eddd0a98/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java index d182bb4..8633333 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java @@ -197,18 +197,18 @@ public class GridCacheAffinityManager extends GridCacheManagerAdapter { public int partition(Object key) { GridAffinityAssignmentCache aff0 = aff; + if (aff0 == null) + throw new IgniteException(FAILED_TO_FIND_CACHE_ERR_MSG + cctx.name()); + boolean keyObj = key instanceof KeyCacheObject; - if (key instanceof KeyCacheObject) { + if (keyObj) { int part = ((KeyCacheObject)key).partition(); if (part != -1) return part; } - if (aff0 == null) - throw new IgniteException(FAILED_TO_FIND_CACHE_ERR_MSG + cctx.name()); - int p = affFunction.partition(affinityKey(key)); if (keyObj)
