Repository: ignite Updated Branches: refs/heads/ignite-1537 1f08d2f7e -> b0b1233b7
ignite-1.5 Should not wait on preloader sync future for system caches callbacks. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/83ce5960 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/83ce5960 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/83ce5960 Branch: refs/heads/ignite-1537 Commit: 83ce5960ba9cba04b1823087802b39a6706aaf8d Parents: 1f08d2f Author: sboikov <[email protected]> Authored: Tue Dec 1 10:59:06 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Dec 1 10:59:06 2015 +0300 ---------------------------------------------------------------------- .../cache/portable/CacheObjectBinaryProcessorImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/83ce5960/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java index 4bdd7e7..220a45a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java @@ -503,10 +503,12 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm if (clientNode) return clientMetaDataCache.get(typeId); else { - BinaryMetadata meta = metaDataCache.localPeek(new PortableMetadataKey(typeId)); + PortableMetadataKey key = new PortableMetadataKey(typeId); + + BinaryMetadata meta = metaDataCache.localPeek(key); if (meta == null && !metaDataCache.context().preloader().syncFuture().isDone()) - meta = metaDataCache.getTopologySafe(new PortableMetadataKey(typeId)); + meta = metaDataCache.getTopologySafe(key); return meta != null ? meta.wrap(portableCtx) : null; }
