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 C5D6F17F81 for ; Thu, 29 Oct 2015 13:09:44 +0000 (UTC) Received: (qmail 78253 invoked by uid 500); 29 Oct 2015 13:09:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 78194 invoked by uid 500); 29 Oct 2015 13:09:43 -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 78182 invoked by uid 99); 29 Oct 2015 13:09:43 -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, 29 Oct 2015 13:09:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9EC8EE391F; Thu, 29 Oct 2015 13:09:41 +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 Message-Id: <08b9e2aa99c4496a97447d37bf05e95a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-1770: Fixed compilation after merge from master. Date: Thu, 29 Oct 2015 13:09:41 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-1770 7eedab172 -> 42da3fa5f IGNITE-1770: Fixed compilation after merge from master. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/42da3fa5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/42da3fa5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/42da3fa5 Branch: refs/heads/ignite-1770 Commit: 42da3fa5fa953fdd1e6d0890b3edda1db23ee531 Parents: 7eedab1 Author: vozerov-gridgain Authored: Thu Oct 29 16:10:22 2015 +0300 Committer: vozerov-gridgain Committed: Thu Oct 29 16:10:22 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/portable/PortableReaderExImpl.java | 3 +-- .../org/apache/ignite/internal/portable/PortableWriterExImpl.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/42da3fa5/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java index b0a3645..7736826 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java @@ -47,7 +47,6 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Collection; import java.util.Date; -import java.util.HashMap; import java.util.LinkedList; import java.util.Map; import java.util.Properties; @@ -2523,7 +2522,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx assert typeId != UNREGISTERED_TYPE_ID; if (idMapper == null) - idMapper = ctx.idMapper(typeId); + idMapper = ctx.userTypeIdMapper(typeId); return idMapper.fieldId(typeId, name); } http://git-wip-us.apache.org/repos/asf/ignite/blob/42da3fa5/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java index 723293a..70ea56d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java @@ -1696,7 +1696,7 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx "via rawWriter() method. Consider fixing serialization logic for class: " + cls.getName()); if (idMapper == null) - idMapper = ctx.idMapper(typeId); + idMapper = ctx.userTypeIdMapper(typeId); int id = idMapper.fieldId(typeId, fieldName);