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 E111417FD8 for ; Mon, 2 Mar 2015 18:45:34 +0000 (UTC) Received: (qmail 26902 invoked by uid 500); 2 Mar 2015 18:45:34 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 26817 invoked by uid 500); 2 Mar 2015 18:45:34 -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 26681 invoked by uid 99); 2 Mar 2015 18:45:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2015 18:45:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 02 Mar 2015 18:45:33 +0000 Received: (qmail 23990 invoked by uid 99); 2 Mar 2015 18:45:07 -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, 02 Mar 2015 18:45:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C173DE0FC4; Mon, 2 Mar 2015 18:45:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 02 Mar 2015 18:45:55 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [49/50] incubator-ignite git commit: IGNITE-141 - Marshallers refactoring X-Virus-Checked: Checked by ClamAV on apache.org IGNITE-141 - Marshallers refactoring Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dbca4338 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dbca4338 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dbca4338 Branch: refs/heads/ignite-141 Commit: dbca43386b7d5ab4f981d09d9f76567f25fd06ca Parents: 095f31d Author: Valentin Kulichenko Authored: Mon Mar 2 10:42:42 2015 -0800 Committer: Valentin Kulichenko Committed: Mon Mar 2 10:42:42 2015 -0800 ---------------------------------------------------------------------- .../marshaller/optimized/OptimizedMarshallerUtils.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dbca4338/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java index 598b5fc..7820e0a 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java @@ -129,22 +129,22 @@ class OptimizedMarshallerUtils { static OptimizedClassDescriptor classDescriptor(int id, ClassLoader ldr, MarshallerContext ctx, OptimizedMarshallerIdMapper mapper) throws IOException, ClassNotFoundException { - Class cls = CLS_BY_ID.get(id).get1(); + IgniteBiTuple t = CLS_BY_ID.get(id); - if (cls == null) { + if (t == null) { String clsName = ctx.className(id); assert clsName != null : id; - cls = U.forName(clsName, ldr); + Class cls = U.forName(clsName, ldr); - IgniteBiTuple old = CLS_BY_ID.putIfAbsent(id, F.t(cls, false)); + IgniteBiTuple old = CLS_BY_ID.putIfAbsent(id, t = F.t(cls, false)); if (old != null) - cls = old.get1(); + t = old; } - return classDescriptor(cls, ctx, mapper); + return classDescriptor(t.get1(), ctx, mapper); } /**