Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2233B2009F2 for ; Thu, 5 May 2016 21:37:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 20C9A160A14; Thu, 5 May 2016 19:37:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 71A72160A20 for ; Thu, 5 May 2016 21:37:39 +0200 (CEST) Received: (qmail 53456 invoked by uid 500); 5 May 2016 19:37:38 -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 51961 invoked by uid 99); 5 May 2016 19:37:37 -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, 05 May 2016 19:37:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D8A0CE93DF; Thu, 5 May 2016 19:37:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmagda@apache.org To: commits@ignite.apache.org Date: Thu, 05 May 2016 19:38:14 -0000 Message-Id: <125a3d57bbf24110909c212d3dcc109a@git.apache.org> In-Reply-To: <157de727a73f4c6fae12667d5751dc81@git.apache.org> References: <157de727a73f4c6fae12667d5751dc81@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [40/40] ignite git commit: IGNITE-2947: fixed issue archived-at: Thu, 05 May 2016 19:37:40 -0000 IGNITE-2947: fixed issue Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f0a595e7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f0a595e7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f0a595e7 Branch: refs/heads/ignite-2947 Commit: f0a595e77bf23f8338910508c10701a62f0283aa Parents: e0fbc11 Author: Denis Magda Authored: Thu May 5 22:37:17 2016 +0300 Committer: Denis Magda Committed: Thu May 5 22:37:17 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/binary/BinaryClassDescriptor.java | 13 +++++++++++++ .../apache/ignite/internal/binary/BinaryContext.java | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f0a595e7/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java index a8280dd..d2d715b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java @@ -62,6 +62,9 @@ public class BinaryClassDescriptor { /** Configured serializer. */ private final BinarySerializer serializer; + /** Serializer that is passed during BinaryClassDescriptor construction. Can differ from {@link #serializer}. */ + private final BinarySerializer initialSerializer; + /** ID mapper. */ private final BinaryInternalMapper mapper; @@ -142,6 +145,8 @@ public class BinaryClassDescriptor { assert cls != null; assert mapper != null; + initialSerializer = serializer; + // If serializer is not defined at this point, then we have to user OptimizedMarshaller. useOptMarshaller = serializer == null; @@ -404,6 +409,14 @@ public class BinaryClassDescriptor { } /** + * @return Initial serializer that is passed during BinaryClassDescriptor construction. + * Can differ from {@link #serializer}. + */ + BinarySerializer initialSerializer() { + return initialSerializer; + } + + /** * @return Affinity field key name. */ String affFieldKeyName() { http://git-wip-us.apache.org/repos/asf/ignite/blob/f0a595e7/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java index 652862f..1a77f9b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java @@ -741,7 +741,7 @@ public class BinaryContext { } if (registered) { - BinarySerializer serializer = desc.serializer(); + BinarySerializer serializer = desc.initialSerializer(); if (serializer == null) serializer = serializerForClass(desc.describedClass());