ignite-471: fixed HeapByteBuffer not serializable exception
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a66d90f8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a66d90f8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a66d90f8 Branch: refs/heads/ignite-471 Commit: a66d90f80e3af70266547e5e072afdbc485c4756 Parents: 887cb01 Author: Denis Magda <dma...@gridgain.com> Authored: Thu May 14 12:45:27 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Thu May 14 12:45:27 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a66d90f8/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index 1365a3e..27fa473 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -1310,7 +1310,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov Map<String, Object> attrs = new HashMap<>(locNode.attributes()); attrs.put(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT, - ignite.configuration().getMarshaller().marshal(subj)); + U.toArray(ignite.configuration().getMarshaller().marshal(subj))); attrs.remove(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS); locNode.setAttributes(attrs); @@ -3270,7 +3270,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov Map<String, Object> attrs = new HashMap<>(node.getAttributes()); attrs.put(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT, - ignite.configuration().getMarshaller().marshal(subj)); + U.toArray(ignite.configuration().getMarshaller().marshal(subj))); node.setAttributes(attrs); } @@ -3570,7 +3570,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov SecurityContext subj = nodeAuth.authenticateNode(node, cred); SecurityContext coordSubj = ignite.configuration().getMarshaller().unmarshal( - node.<ByteBuffer>attribute(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT), + ByteBuffer.wrap(node.<byte[]>attribute(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT)), U.gridClassLoader()); if (!permissionsEqual(coordSubj.subject().permissions(), subj.subject().permissions())) {
