ignite-2683
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/83b6fa2f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/83b6fa2f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/83b6fa2f Branch: refs/heads/ignite-2683 Commit: 83b6fa2f2416101285413c364d9a77cb7b993847 Parents: 7ee8934 Author: ashutak <[email protected]> Authored: Fri Feb 19 18:50:36 2016 +0300 Committer: ashutak <[email protected]> Committed: Fri Feb 19 18:50:36 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/binary/BinaryUtils.java | 2 +- .../java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 5 +++-- .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 8 +++++--- .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6fa2f/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java index 1b53ffd..d5b0854 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java @@ -1560,7 +1560,7 @@ public class BinaryUtils { ByteArrayInputStream input = new ByteArrayInputStream(in.array(), in.position(), len); try { - return ctx.optimizedMarsh().unmarshal(input, clsLdr); + return ctx.optimizedMarsh().unmarshal(input, U.resolveClassLoader(clsLdr, ctx.configuration())); } catch (IgniteCheckedException e) { throw new BinaryObjectException("Failed to unmarshal object with optimized marshaller", e); http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6fa2f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index 2b00a02..ccc6309 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -885,7 +885,7 @@ class ClientImpl extends TcpDiscoveryImpl { TcpDiscoveryAbstractMessage msg; try { - msg = spi.marsh.unmarshal(in, U.gridClassLoader()); + msg = spi.marsh.unmarshal(in, U.resolveClassLoader(spi.ignite().configuration())); } catch (IgniteCheckedException e) { if (log.isDebugEnabled()) @@ -1210,7 +1210,8 @@ class ClientImpl extends TcpDiscoveryImpl { List<TcpDiscoveryAbstractMessage> msgs = null; while (!isInterrupted()) { - TcpDiscoveryAbstractMessage msg = spi.marsh.unmarshal(in, U.gridClassLoader()); + TcpDiscoveryAbstractMessage msg = spi.marsh.unmarshal(in, + U.resolveClassLoader(spi.ignite().configuration())); if (msg instanceof TcpDiscoveryClientReconnectMessage) { TcpDiscoveryClientReconnectMessage res = (TcpDiscoveryClientReconnectMessage)msg; http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6fa2f/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 3c8d6c6..3ce983e 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 @@ -2325,7 +2325,8 @@ class ServerImpl extends TcpDiscoveryImpl { if (marshalledMsg == null) marshalledMsg = spi.marsh.marshal(msg); - msgClone = spi.marsh.unmarshal(marshalledMsg, null); + msgClone = spi.marsh.unmarshal(marshalledMsg, + U.resolveClassLoader(spi.ignite().configuration())); } catch (IgniteCheckedException e) { U.error(log, "Failed to marshal message: " + msg, e); @@ -3545,7 +3546,7 @@ class ServerImpl extends TcpDiscoveryImpl { SecurityContext coordSubj = spi.marsh.unmarshal( node.<byte[]>attribute(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT), - U.gridClassLoader()); + U.resolveClassLoader(spi.ignite().configuration())); if (!permissionsEqual(coordSubj.subject().permissions(), subj.subject().permissions())) { // Node has not pass authentication. @@ -5181,7 +5182,8 @@ class ServerImpl extends TcpDiscoveryImpl { while (!isInterrupted()) { try { - TcpDiscoveryAbstractMessage msg = spi.marsh.unmarshal(in, U.gridClassLoader()); + TcpDiscoveryAbstractMessage msg = spi.marsh.unmarshal(in, + U.resolveClassLoader(spi.ignite().configuration())); msg.senderNodeId(nodeId); http://git-wip-us.apache.org/repos/asf/ignite/blob/83b6fa2f/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 0d41cd2..277055a 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 @@ -1466,7 +1466,8 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T try { sock.setSoTimeout((int)timeout); - T res = marsh.unmarshal(in == null ? sock.getInputStream() : in, U.gridClassLoader()); + T res = marsh.unmarshal(in == null ? sock.getInputStream() : in, + U.resolveClassLoader(ignite.configuration())); return res; }
