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 620D6200B9F for ; Mon, 5 Sep 2016 15:18:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 60C49160ACB; Mon, 5 Sep 2016 13:18:31 +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 5F46F160AE0 for ; Mon, 5 Sep 2016 15:18:30 +0200 (CEST) Received: (qmail 67700 invoked by uid 500); 5 Sep 2016 13:18:29 -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 67169 invoked by uid 99); 5 Sep 2016 13:18:29 -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; Mon, 05 Sep 2016 13:18:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E31ABEEE7B; Mon, 5 Sep 2016 13:18:28 +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: Mon, 05 Sep 2016 13:18:43 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/20] ignite git commit: IGNITE-3817: Fixed binary object re-build with missing schema. archived-at: Mon, 05 Sep 2016 13:18:31 -0000 IGNITE-3817: Fixed binary object re-build with missing schema. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/42963e6c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/42963e6c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/42963e6c Branch: refs/heads/ignite-3611-1 Commit: 42963e6c99e9b282972e6ad67a813a8038cf580f Parents: 40d4b6a Author: Alexander Paschenko Authored: Mon Sep 5 14:10:39 2016 +0300 Committer: vozerov-gridgain Committed: Mon Sep 5 14:10:39 2016 +0300 ---------------------------------------------------------------------- .../binary/builder/BinaryObjectBuilderImpl.java | 2 +- .../binary/BinaryObjectBuilderAdditionalSelfTest.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/42963e6c/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java index 16c51b0..086da5c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java @@ -199,7 +199,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder { Map fieldsMeta = null; - if (reader != null) { + if (reader != null && BinaryUtils.hasSchema(flags)) { BinarySchema schema = reader.schema(); Map assignedFldsById; http://git-wip-us.apache.org/repos/asf/ignite/blob/42963e6c/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java index f999ad3..24806cb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java @@ -56,6 +56,7 @@ import org.apache.ignite.internal.binary.builder.BinaryBuilderEnum; import org.apache.ignite.internal.binary.builder.BinaryObjectBuilderImpl; import org.apache.ignite.internal.binary.mutabletest.GridBinaryMarshalerAwareTestClass; import org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses; +import org.apache.ignite.internal.binary.test.GridBinaryTestClass2; import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl; import org.apache.ignite.internal.processors.cache.binary.IgniteBinaryImpl; import org.apache.ignite.internal.util.lang.GridMapEntry; @@ -1389,6 +1390,19 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes } /** + * Ensure that object w/o schema can be re-built. + */ + public void testBuildFromObjectWithoutSchema() { + BinaryObjectBuilderImpl binBuilder = wrap(new GridBinaryTestClass2()); + + BinaryObject binObj = binBuilder.build(); + + BinaryObjectBuilderImpl binBuilder2 = wrap(binObj); + + binBuilder2.build(); + } + + /** * @param obj Object. * @return Object in binary format. */