# ignite-537

modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java

@@ -36,7 +36,6 @@
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.worker.*;
 import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.jdk.*;
 import org.apache.ignite.plugin.security.*;
 import org.apache.ignite.plugin.segmentation.*;
 import org.apache.ignite.spi.*;
@@ -172,9 +171,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
     /** Map of dynamic cache filters. */
     private Map<String, CachePredicate> registeredCaches = new HashMap<>();
 
-    /** */
-    private JdkMarshaller jdkMarsh = new JdkMarshaller();
-
     /** @param ctx Context. */
     public GridDiscoveryManager(GridKernalContext ctx) {
         super(ctx, ctx.config().getDiscoverySpi());
@@ -421,59 +417,40 @@ else if (evtType != EVT_NODE_METRICS_UPDATED)
         });
 
         spi.setDataExchange(new DiscoverySpiDataExchange() {
-            @Override public Map<Integer, byte[]> collect(UUID nodeId) {
+            @Override public Map<Integer, Object> collect(UUID nodeId) {
                 assert nodeId != null;
 
-                Map<Integer, byte[]> data = new HashMap<>();
+                Map<Integer, Object> data = new HashMap<>();
 
                 for (GridComponent comp : ctx.components()) {
                     Object compData = comp.collectDiscoveryData(nodeId);
 
                     if (compData != null) {
                         assert comp.discoveryDataType() != null;
 
-                        try {
-                            byte[] bytes = jdkMarsh.marshal(compData);
-
-                            data.put(comp.discoveryDataType().ordinal(), bytes);
-                        }
-                        catch (IgniteCheckedException e) {
-                            U.error(log, "Failed to marshal discovery data " +
-                                "[comp=" + comp + ", data=" + compData + ']', e);
-                        }
+                        data.put(comp.discoveryDataType().ordinal(), compData);
                     }
                 }
 
                 return data;
             }
 
-            @Override public void onExchange(UUID joiningNodeId,
-                UUID nodeId,
-                Map<Integer, byte[]> data,
-                ClassLoader clsLdr) {
-                for (Map.Entry<Integer, byte[]> entry : data.entrySet()) {
+            @Override public void onExchange(UUID joiningNodeId, UUID nodeId, Map<Integer, Object> data) {
+                for (Map.Entry<Integer, Object> e : data.entrySet()) {
                     GridComponent comp = null;
 
                     for (GridComponent c : ctx.components()) {
-                        if (c.discoveryDataType() != null && c.discoveryDataType().ordinal() == entry.getKey()) {
+                        if (c.discoveryDataType() != null && c.discoveryDataType().ordinal() == e.getKey()) {
                             comp = c;
 
                             break;
                         }
                     }
 
-                    if (comp != null) {
-                        try {
-                            Object compData = jdkMarsh.unmarshal(entry.getValue(), clsLdr);
-
-                            comp.onDiscoveryDataReceived(joiningNodeId, nodeId, compData);
-                        }
-                        catch (IgniteCheckedException e) {
-                            U.error(log, "Failed to unmarshal discovery data for component: "  + comp, e);
-                        }
-                    }
+                    if (comp != null)
+                        comp.onDiscoveryDataReceived(joiningNodeId, nodeId, e.getValue());
                     else
-                        U.warn(log, "Received discovery data for unknown component: " + entry.getKey());
+                        U.warn(log, "Received discovery data for unknown component: " + e.getKey());
                 }
             }
         });

modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java

@@ -30,6 +30,7 @@
 import org.apache.ignite.internal.processors.timeout.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.internal.util.future.*;
+import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
@@ -1559,7 +1560,7 @@ void p2pUnmarshal(Marshaller marsh, @Nullable ClassLoader ldr) throws IgniteChec
     /**
      * Discovery data.
      */
-    private static class DiscoveryData implements Externalizable {
+    private static class DiscoveryData implements Externalizable, GridPeerDeployAware {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -1577,6 +1578,16 @@ public DiscoveryData() {
             // No-op.
         }
 
+        @Override
+        public Class<?> deployClass() {
+            return U.peerDeployAware0(items).deployClass();
+        }
+
+        @Override
+        public ClassLoader classLoader() {
+            return U.peerDeployAware0(items).classLoader();
+        }
+
         /**
          * @param nodeId Node ID.
          */
@@ -1616,7 +1627,7 @@ public void addItem(DiscoveryDataItem item) {
     /**
      * Discovery data item.
      */
-    private static class DiscoveryDataItem implements Externalizable {
+    private static class DiscoveryDataItem implements Externalizable, GridPeerDeployAware {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -1666,6 +1677,16 @@ public DiscoveryDataItem() {
             this.interval = interval;
         }
 
+        @Override
+        public Class<?> deployClass() {
+            return prjPred.getClass();
+        }
+
+        @Override
+        public ClassLoader classLoader() {
+            return prjPred.getClass().getClassLoader();
+        }
+
         /** {@inheritDoc} */
         @Override public void writeExternal(ObjectOutput out) throws IOException {
             U.writeUuid(out, routineId);

modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java

@@ -33,18 +33,16 @@ public interface DiscoverySpiDataExchange {
      * @param joiningNodeId ID of new node that joins topology.
      * @return Collection of discovery data objects from different components.
      */
-    public Map<Integer, byte[]> collect(UUID joiningNodeId);
+    public Map<Integer, Object> collect(UUID joiningNodeId);
 
     /**
      * Notifies discovery manager about data received from remote node.
      *
      * @param joiningNodeId Joining node ID.
      * @param nodeId Remote node ID for which data is provided.
      * @param data Collection of marshalled discovery data objects from different components.
-     * @param clsLdr Class loader to use for discovery data unmarshalling.
      */
     public void onExchange(UUID joiningNodeId,
         UUID nodeId,
-        Map<Integer, byte[]> data,
-        ClassLoader clsLdr);
+        Map<Integer, Object> data);
 }

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java

@@ -897,10 +897,9 @@ private void processNodeAddedMessage(TcpDiscoveryNodeAddedMessage msg) {
 
                         if (dataMap != null) {
                             for (Map.Entry<UUID, Map<Integer, byte[]>> entry : dataMap.entrySet()) {
-                                exchange.onExchange(newNodeId,
-                                    entry.getKey(),
-                                    entry.getValue(),
-                                    exchangeClassLoader(newNodeId));
+//                                exchange.onExchange(newNodeId,
+//                                    entry.getKey(),
+//                                    entry.getValue());
                             }
                         }
 
@@ -923,8 +922,8 @@ else if (log.isDebugEnabled())
 
                     Map<Integer, byte[]> data = msg.newNodeDiscoveryData();
 
-                    if (data != null)
-                        exchange.onExchange(newNodeId, newNodeId, data, exchangeClassLoader(newNodeId));
+//                    if (data != null)
+//                        exchange.onExchange(newNodeId, newNodeId, data);
                 }
             }
         }