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 6BE8C18966 for ; Wed, 11 Nov 2015 07:44:48 +0000 (UTC) Received: (qmail 28693 invoked by uid 500); 11 Nov 2015 07:44:48 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 28600 invoked by uid 500); 11 Nov 2015 07:44:48 -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 28449 invoked by uid 99); 11 Nov 2015 07:44:48 -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; Wed, 11 Nov 2015 07:44:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CBCC8E0921; Wed, 11 Nov 2015 07:44:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Wed, 11 Nov 2015 07:44:52 -0000 Message-Id: <15166c7da40448a6ade6853cde22b897@git.apache.org> In-Reply-To: <8e2d4e321e914f3fbbf769db3517d9a2@git.apache.org> References: <8e2d4e321e914f3fbbf769db3517d9a2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/7] ignite git commit: Merge branch 'ignite-1282' into ignite-1847 Merge branch 'ignite-1282' into ignite-1847 Conflicts: modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8f6a5880 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8f6a5880 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8f6a5880 Branch: refs/heads/ignite-1847 Commit: 8f6a58803c1d6a5083e05a2ea4b3a9ea40cd0121 Parents: 326c1f1 0dc8902 Author: vozerov-gridgain Authored: Wed Nov 11 10:44:18 2015 +0300 Committer: vozerov-gridgain Committed: Wed Nov 11 10:44:18 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteBinary.java | 2 +- .../apache/ignite/binary/BinaryIdMapper.java | 56 ++++++++++++++++++++ .../org/apache/ignite/binary/BinaryReader.java | 2 +- .../ignite/binary/BinaryTypeConfiguration.java | 6 +-- .../ignite/binary/BinaryTypeIdMapper.java | 56 -------------------- .../org/apache/ignite/binary/BinaryWriter.java | 2 +- .../internal/portable/BinaryReaderExImpl.java | 4 +- .../internal/portable/BinaryWriterExImpl.java | 4 +- .../portable/PortableClassDescriptor.java | 8 +-- .../internal/portable/PortableContext.java | 42 +++++++-------- .../marshaller/portable/PortableMarshaller.java | 8 +-- .../GridBinaryObjectBuilderSelfTest.java | 4 +- .../GridPortableMarshallerSelfTest.java | 26 ++++----- .../portable/GridPortableWildcardsSelfTest.java | 35 ++++++------ .../cpp/common/include/ignite/common/java.h | 2 +- modules/platforms/cpp/common/src/java.cpp | 6 +-- 16 files changed, 133 insertions(+), 130 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8f6a5880/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8f6a5880/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java index 377273c,f779706..f721f12 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java @@@ -128,13 -128,13 +128,13 @@@ public class PortableContext implement private final Map, Byte> mapTypes = new HashMap<>(); /** */ - private final ConcurrentMap mappers = new ConcurrentHashMap8<>(0); + private final ConcurrentMap mappers = new ConcurrentHashMap8<>(0); /** */ - private final Map typeMappers = new ConcurrentHashMap8<>(0); + private final Map typeMappers = new ConcurrentHashMap8<>(0); /** */ - private PortableMetaDataHandler metaHnd; + private BinaryMetadataHandler metaHnd; /** */ private MarshallerContext marshCtx; http://git-wip-us.apache.org/repos/asf/ignite/blob/8f6a5880/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8f6a5880/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8f6a5880/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java index 1b036d1,7522bf9..bc901fa --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java @@@ -23,11 -23,11 +23,14 @@@ import org.apache.ignite.configuration. import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.MarshallerContextTestImpl; import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.binary.BinaryIdMapper; ++import org.apache.ignite.binary.BinaryTypeIdMapper; + import org.apache.ignite.binary.BinaryType; + import org.apache.ignite.binary.BinaryTypeConfiguration; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import java.util.Arrays; +import java.util.Map; + /** * Wildcards test. */