[24/50] incubator-ignite git commit: # ignite-537

[sergi]

# 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/876beff5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/876beff5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/876beff5

Branch: refs/heads/ignite-718
Commit: 876beff516e02c205e69c02d8bbd48811aec15e6
Parents: 0b14239
Author: sboikov <semen.boi...@inria.fr>
Authored: Fri Apr 10 20:36:07 2015 +0300
Committer: sboikov <semen.boi...@inria.fr>
Committed: Fri Apr 10 20:36:07 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/876beff5/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 82a2e59..117166f 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
@@ -2268,7 +2268,7 @@ public class TcpDiscoverySpi extends 
TcpDiscoverySpiAdapter implements TcpDiscov
             return null;
 
         if (node.id().equals(getLocalNodeId()) || node.isClient())
-            return U.gridClassLoader();
+            return null;
 
         DiscoveryDeploymentClassLoader ldr = p2pLdrs.get(node.id());
 
@@ -2291,7 +2291,7 @@ public class TcpDiscoverySpi extends 
TcpDiscoverySpiAdapter implements TcpDiscov
             return null;
 
         if (nodeId.equals(getLocalNodeId()))
-            return U.gridClassLoader();
+            return null;
 
         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 U.gridClassLoader();
+                return null;
             }
         }
 
         if (node.isClient()) // Do not support loading from client nodes.
-            return U.gridClassLoader();
+            return null;
 
         DiscoveryDeploymentClassLoader ldr = p2pLdrs.get(nodeId);