Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 376B918402 for ; Fri, 11 Dec 2015 08:00:04 +0000 (UTC) Received: (qmail 21812 invoked by uid 500); 11 Dec 2015 08:00:03 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 21644 invoked by uid 500); 11 Dec 2015 08:00:03 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 21264 invoked by uid 99); 11 Dec 2015 08:00:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2015 08:00:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 69693E1778; Fri, 11 Dec 2015 08:00:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Fri, 11 Dec 2015 08:00:18 -0000 Message-Id: In-Reply-To: <86fb218e88fe404ea3249cc4eaf047da@git.apache.org> References: <86fb218e88fe404ea3249cc4eaf047da@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/16] ignite git commit: ignite-1.5 Fix for transaction retry logic in DataStructuresProcessor. ignite-1.5 Fix for transaction retry logic in DataStructuresProcessor. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5dbfa926 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5dbfa926 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5dbfa926 Branch: refs/heads/ignite-1537 Commit: 5dbfa9264b0124c145399612fa02c344adafa51f Parents: 847bd42 Author: sboikov Authored: Fri Dec 11 10:59:47 2015 +0300 Committer: sboikov Committed: Fri Dec 11 10:59:47 2015 +0300 ---------------------------------------------------------------------- .../cache/portable/CacheObjectBinaryProcessorImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5dbfa926/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 cd65681..5d26aae 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 @@ -499,8 +499,16 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** {@inheritDoc} */ @Nullable @Override public BinaryType metadata(final int typeId) throws BinaryObjectException { try { - if (clientNode) - return clientMetaDataCache.get(typeId); + if (clientNode) { + BinaryType typeMeta = clientMetaDataCache.get(typeId); + + if (typeMeta != null) + return typeMeta; + + BinaryMetadata meta = metaDataCache.getTopologySafe(new PortableMetadataKey(typeId)); + + return meta != null ? meta.wrap(portableCtx) : null; + } else { PortableMetadataKey key = new PortableMetadataKey(typeId);