# ignite-537
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/439af365 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/439af365 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/439af365 Branch: refs/heads/ignite-sprint-4 Commit: 439af36517d98280805c711eeaf9e24114c3fd6d Parents: f316e9a Author: sboikov <semen.boi...@inria.fr> Authored: Fri Apr 10 21:04:01 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Fri Apr 10 21:04:01 2015 +0300 ---------------------------------------------------------------------- .../spi/discovery/tcp/TcpDiscoverySpi.java | 21 ++++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/439af365/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 bf8cbdb..1ab5332 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 @@ -2265,10 +2265,10 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov assert ignite != null; if (!ignite.configuration().isPeerClassLoadingEnabled()) - return null; + return U.gridClassLoader(); if (node.id().equals(getLocalNodeId()) || node.isClient()) - return null; + return U.gridClassLoader(); DiscoveryDeploymentClassLoader ldr = p2pLdrs.get(node.id()); @@ -2288,10 +2288,10 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov assert ignite != null; if (!ignite.configuration().isPeerClassLoadingEnabled()) - return null; + return U.gridClassLoader(); if (nodeId.equals(getLocalNodeId())) - return null; + return U.gridClassLoader(); TcpDiscoveryNode node; @@ -2305,12 +2305,12 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov log.debug("Node provided exchange data left, will use local class loader " + "for exchange data [nodeId=" + nodeId + ']'); - return null; + return U.gridClassLoader(); } } if (node.isClient()) // Do not support loading from client nodes. - return null; + return U.gridClassLoader(); DiscoveryDeploymentClassLoader ldr = p2pLdrs.get(nodeId); @@ -5405,6 +5405,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov * @param node Node. */ public DiscoveryDeploymentClassLoader(TcpDiscoveryNode node) { + super(U.gridClassLoader()); + assert !node.isClient() : node; assert !node.id().equals(getLocalNodeId()) : node; @@ -5462,13 +5464,6 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov /** {@inheritDoc} */ @Override protected Class<?> findClass(String name) throws ClassNotFoundException { - try { - return U.gridClassLoader().loadClass(name); - } - catch (ClassNotFoundException ignore) { - // Ignore. - } - lock.readLock().lock(); try {
