Repository: ignite Updated Branches: refs/heads/ignite-5009 213f92f4a -> 6f9735fa9
ignite-5009 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f9735fa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f9735fa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f9735fa Branch: refs/heads/ignite-5009 Commit: 6f9735fa96b889bb547cbf03677aa87a9832ed81 Parents: 213f92f Author: sboikov <[email protected]> Authored: Tue Apr 25 10:01:55 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Apr 25 10:01:55 2017 +0300 ---------------------------------------------------------------------- .../cache/IgniteCacheOffheapManagerImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6f9735fa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java index 10cc827..099840a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java @@ -363,12 +363,19 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple /** {@inheritDoc} */ @Nullable @Override public CacheDataRow read(KeyCacheObject key) throws IgniteCheckedException { + CacheDataRow row; + if (cctx.isLocal()) - return locCacheDataStore.find(key); + row = locCacheDataStore.find(key); + else { + GridDhtLocalPartition part = cctx.topology().localPartition(cctx.affinity().partition(key), null, false); + + row = part != null ? dataStore(part).find(key) : null; + } - GridDhtLocalPartition part = cctx.topology().localPartition(cctx.affinity().partition(key), null, false); + assert row == null || row.value() != null : row; - return part != null ? dataStore(part).find(key) : null; + return row; } /** {@inheritDoc} */
