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 37FDA1809E for ; Mon, 20 Jul 2015 20:48:39 +0000 (UTC) Received: (qmail 641 invoked by uid 500); 20 Jul 2015 20:48:05 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 611 invoked by uid 500); 20 Jul 2015 20:48:04 -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 599 invoked by uid 99); 20 Jul 2015 20:48:04 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jul 2015 20:48:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 62FDE189FCA for ; Mon, 20 Jul 2015 20:48:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.791 X-Spam-Level: X-Spam-Status: No, score=0.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id DjJagzws5yU9 for ; Mon, 20 Jul 2015 20:47:50 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id F3D0B23131 for ; Mon, 20 Jul 2015 20:47:49 +0000 (UTC) Received: (qmail 99462 invoked by uid 99); 20 Jul 2015 20:47:49 -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, 20 Jul 2015 20:47:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BC416E10A2; Mon, 20 Jul 2015 20:47:49 +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, 20 Jul 2015 20:47:51 -0000 Message-Id: <56297ab3137e4785b5ddcc2edc70585a@git.apache.org> In-Reply-To: <80c0d227ff214ce4a5955c10b392a4df@git.apache.org> References: <80c0d227ff214ce4a5955c10b392a4df@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/19] incubator-ignite git commit: GG-10556 Fixed stuck on unmarshal security subject. GG-10556 Fixed stuck on unmarshal security subject. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6711d2c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6711d2c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6711d2c7 Branch: refs/heads/ignite-884 Commit: 6711d2c799b99d7a0ae3855475cccafbf362f5dd Parents: 7d27103 Author: nikolay_tikhonov Authored: Wed Jul 15 10:30:12 2015 +0300 Committer: Alexey Goncharuk Committed: Fri Jul 17 00:05:31 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6711d2c7/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index d51293e..a5ae5a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -631,8 +631,7 @@ class ServerImpl extends TcpDiscoveryImpl { Map attrs = new HashMap<>(locNode.attributes()); - attrs.put(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT, - spi.ignite().configuration().getMarshaller().marshal(subj)); + attrs.put(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT, spi.marsh.marshal(subj)); attrs.remove(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS); locNode.setAttributes(attrs); @@ -2586,8 +2585,7 @@ class ServerImpl extends TcpDiscoveryImpl { // Stick in authentication subject to node (use security-safe attributes for copy). Map attrs = new HashMap<>(node.getAttributes()); - attrs.put(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT, - spi.ignite().configuration().getMarshaller().marshal(subj)); + attrs.put(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT, spi.marsh.marshal(subj)); node.setAttributes(attrs); } @@ -2935,7 +2933,7 @@ class ServerImpl extends TcpDiscoveryImpl { else { SecurityContext subj = spi.nodeAuth.authenticateNode(node, cred); - SecurityContext coordSubj = spi.ignite().configuration().getMarshaller().unmarshal( + SecurityContext coordSubj = spi.marsh.unmarshal( node.attribute(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT), U.gridClassLoader());