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 E992217600 for ; Tue, 2 Jun 2015 09:40:37 +0000 (UTC) Received: (qmail 74837 invoked by uid 500); 2 Jun 2015 09:40:37 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 74806 invoked by uid 500); 2 Jun 2015 09:40:37 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 74797 invoked by uid 99); 2 Jun 2015 09:40:37 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2015 09:40:37 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 52F01CAA84 for ; Tue, 2 Jun 2015 09:40:37 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.771 X-Spam-Level: X-Spam-Status: No, score=0.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id MPFXeVHO2poH for ; Tue, 2 Jun 2015 09:40:33 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 5ED9147C03 for ; Tue, 2 Jun 2015 09:40:33 +0000 (UTC) Received: (qmail 74678 invoked by uid 99); 2 Jun 2015 09:40:33 -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; Tue, 02 Jun 2015 09:40:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D33C2DFF6A; Tue, 2 Jun 2015 09:40:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 02 Jun 2015 09:40:35 -0000 Message-Id: <83fd7c3304f34580801d4d8396b8545a@git.apache.org> In-Reply-To: <23dc4e4f8ce44bc5bcc82ea841abacee@git.apache.org> References: <23dc4e4f8ce44bc5bcc82ea841abacee@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] incubator-ignite git commit: ignite-471-2: modifications after the next review round ignite-471-2: modifications after the next review round Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e2299bc3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e2299bc3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e2299bc3 Branch: refs/heads/ignite-gg-10054 Commit: e2299bc323e1b9d5a2b91e696776e3397d93c66a Parents: 2e58d49 Author: Denis Magda Authored: Tue Jun 2 12:05:03 2015 +0300 Committer: Denis Magda Committed: Tue Jun 2 12:05:03 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/MarshallerContextAdapter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e2299bc3/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java index 4ccb759..2be5afa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java @@ -41,7 +41,7 @@ public abstract class MarshallerContextAdapter implements MarshallerContext { private final ConcurrentMap map = new ConcurrentHashMap8<>(); /** */ - private final Set registeredTypes = new HashSet<>(); + private final Set registeredSystemTypes = new HashSet<>(); /** * Initializes context. @@ -86,7 +86,7 @@ public abstract class MarshallerContextAdapter implements MarshallerContext { throw new IgniteException("Duplicate type ID [id=" + typeId + ", clsName=" + clsName + ", oldClsName=" + oldClsName + ']'); - registeredTypes.add(clsName); + registeredSystemTypes.add(clsName); } } } @@ -131,7 +131,7 @@ public abstract class MarshallerContextAdapter implements MarshallerContext { /** {@inheritDoc} */ @Override public boolean isSystemType(String typeName) { - return registeredTypes.contains(typeName); + return registeredSystemTypes.contains(typeName); } /**