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/master Commit: 6711d2c799b99d7a0ae3855475cccafbf362f5dd Parents: 7d27103 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Wed Jul 15 10:30:12 2015 +0300 Committer: Alexey Goncharuk <agoncha...@gridgain.com> 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<String, Object> 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<String, Object> 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.<byte[]>attribute(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT), U.gridClassLoader());
