Fix binary

Author: shishkovilja

modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java

@@ -632,7 +632,7 @@ public CoreMessagesProvider(Marshaller dfltMarsh, Marshaller schemaAwareMarsh, C
         withNoSchema(MetadataRequestMessage.class);
         withNoSchema(MetadataResponseMessage.class);
         withNoSchema(MarshallerMappingItem.class);
-        withNoSchema(BinaryMetadataVersionInfo.class);
+        withSchemaResolvedClassLoader(BinaryMetadataVersionInfo.class);
         withNoSchema(BinaryMetadataVersionsData.class);
         withNoSchema(MappedName.class);
         withNoSchema(MarshallerMappingsData.class);
@@ -674,6 +674,11 @@ private <T extends Message> void withNoSchemaResolvedClassLoader(Class<T> cls) {
         register(cls, dfltMarsh, resolvedClsLdr);
     }
 
+    /** Registers message using {@link #schemaAwareMarsh} and {@link #resolvedClsLdr}. */
+    private <T extends Message> void withSchemaResolvedClassLoader(Class<T> cls) {
+        register(cls, schemaAwareMarsh, resolvedClsLdr);
+    }
+
     /** Registers message using incrementing {@link #msgIdx} as the message id/type. */
     private <T extends Message> void register(Class<T> cls, Marshaller marsh, ClassLoader clsLrd) {
         register(factory, cls, msgIdx++, marsh, clsLrd);

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java

@@ -841,15 +841,6 @@ private final class MetadataRequestListener implements GridMessageListener {
 
             MetadataResponseMessage resp = new MetadataResponseMessage(typeId);
 
-            if (metaVerInfo != null) {
-                try {
-                    metaVerInfo.marshalMetadata();
-                }
-                catch (IgniteCheckedException e) {
-                    U.error(log, "Failed to marshal binary metadata for [typeId=" + typeId + ']', e);
-                }
-            }
-
             resp.metadataVersionInfo(metaVerInfo);
 
             try {
@@ -890,16 +881,9 @@ private final class MetadataResponseListener implements GridMessageListener {
                 return;
             }
 
-            try {
-                metaVerInfo.unmarshalMetadata();
-
-                casBinaryMetadata(typeId, metaVerInfo);
+            casBinaryMetadata(typeId, metaVerInfo);
 
-                fut.onDone(MetadataUpdateResult.createSuccessfulResult(-1));
-            }
-            catch (IgniteCheckedException e) {
-                fut.onDone(MetadataUpdateResult.createFailureResult(new BinaryObjectException(e)));
-            }
+            fut.onDone(MetadataUpdateResult.createSuccessfulResult(-1));
         }
     }
 

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java

@@ -18,20 +18,19 @@
 
 import java.io.Serializable;
 import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.MarshallableMessage;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.binary.BinaryMetadata;
 import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.plugin.extensions.communication.Message;
-
-import static org.apache.ignite.marshaller.Marshallers.jdk;
+import org.apache.ignite.marshaller.Marshaller;
 
 /**
  * Wrapper for {@link BinaryMetadata} which is stored in metadata local cache on each node.
  * Used internally to track version counters (see javadoc for {@link MetadataUpdateProposedMessage} for more details).
  * The version refers solely to the internal protocol for updating BinaryMetadata and is unknown externally.
  * It can be updated dynamically from different nodes and threads on the same node.
  */
-public final class BinaryMetadataVersionInfo implements Serializable, Message {
+public final class BinaryMetadataVersionInfo implements Serializable, MarshallableMessage {
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -130,24 +129,16 @@ boolean removing() {
         return removing;
     }
 
-    /**
-     * Marshals binary metadata to byte array.
-     *
-     * @throws IgniteCheckedException If failed.
-     */
-    public void marshalMetadata() throws IgniteCheckedException {
-        if (metadataBytes == null)
-            metadataBytes = U.marshal(jdk(), metadata);
+    /** {@inheritDoc} */
+    @Override public void prepareMarshal(Marshaller marsh) throws IgniteCheckedException {
+        if (metadata != null)
+            metadataBytes = U.marshal(marsh, metadata);
     }
 
-    /**
-     * Unmarshals binary metadata from byte array.
-     *
-     * @throws IgniteCheckedException If failed.
-     */
-    public void unmarshalMetadata() throws IgniteCheckedException {
-        if (metadata == null && metadataBytes != null) {
-            metadata = U.unmarshal(jdk(), metadataBytes, U.gridClassLoader());
+    /** {@inheritDoc} */
+    @Override public void finishUnmarshal(Marshaller marsh, ClassLoader clsLdr) throws IgniteCheckedException {
+        if (metadataBytes != null) {
+            metadata = U.unmarshal(marsh, metadataBytes, clsLdr);
 
             // It is not required anymore.
             metadataBytes = null;