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 920B718C80 for ; Thu, 26 Nov 2015 10:51:00 +0000 (UTC) Received: (qmail 54819 invoked by uid 500); 26 Nov 2015 10:51:00 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 54326 invoked by uid 500); 26 Nov 2015 10:50:59 -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 53853 invoked by uid 99); 26 Nov 2015 10:50:59 -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; Thu, 26 Nov 2015 10:50:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0AF9DE2C38; Thu, 26 Nov 2015 10:50:58 +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: Thu, 26 Nov 2015 10:51:17 -0000 Message-Id: <8e4ebd3f48eb427485c8f957cca58c8b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/38] ignite git commit: Fixing marshalToPortable and IgniteBiTuple Fixing marshalToPortable and IgniteBiTuple Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/afcf0ab5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/afcf0ab5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/afcf0ab5 Branch: refs/heads/ignite-1537 Commit: afcf0ab5e5d8e33351cf37790894c1d71ac6cc65 Parents: 809a442 Author: Alexey Goncharuk Authored: Thu Nov 26 09:21:50 2015 +0300 Committer: Alexey Goncharuk Committed: Thu Nov 26 09:21:50 2015 +0300 ---------------------------------------------------------------------- .../cache/portable/CacheObjectBinaryProcessorImpl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/afcf0ab5/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 ba7d6f8..819b57e 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 @@ -62,11 +62,13 @@ import org.apache.ignite.internal.util.lang.GridMapEntry; import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiPredicate; +import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.lang.IgniteClosure; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.internal.portable.BinaryMarshaller; @@ -390,6 +392,15 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm return pArr; } + if (obj instanceof IgniteBiTuple) { + IgniteBiTuple tup = (IgniteBiTuple)obj; + + if (obj instanceof T2) + return new T2<>(marshalToPortable(tup.get1()), marshalToPortable(tup.get2())); + + return new IgniteBiTuple<>(marshalToPortable(tup.get1()), marshalToPortable(tup.get2())); + } + if (obj instanceof Collection) { Collection col = (Collection)obj;