This is an automated email from the ASF dual-hosted git repository.

shishkovilja pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 5c9f3ea0b63 IGNITE-28988 Remove SerializableDataBagItemWrapper (#13481)
5c9f3ea0b63 is described below

commit 5c9f3ea0b6364478fad4bfcbe698d27c6637d1ef
Author: Ilya Shishkov <[email protected]>
AuthorDate: Mon Sep 28 15:50:32 2026 +0300

    IGNITE-28988 Remove SerializableDataBagItemWrapper (#13481)
---
 .../ignite/internal/CoreMessagesProvider.java      |   3 +-
 .../ignite/spi/discovery/DiscoveryDataBag.java     |  46 +++------
 .../discovery/SerializableDataBagItemWrapper.java  | 107 ---------------------
 .../ignite/spi/discovery/tcp/ServerImpl.java       |  12 +--
 .../ignite/spi/discovery/tcp/TcpDiscoverySpi.java  |  16 +--
 .../tcp/internal/DiscoveryDataPacket.java          | 101 +------------------
 .../zk/internal/ZkDiscoDataBagWrapper.java         |  37 -------
 .../zk/internal/ZookeeperDiscoveryImpl.java        |   2 +-
 8 files changed, 24 insertions(+), 300 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java
index f7537f0b20f..923ef50c937 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java
@@ -297,7 +297,6 @@ import 
org.apache.ignite.spi.communication.tcp.messages.HandshakeMessage;
 import org.apache.ignite.spi.communication.tcp.messages.HandshakeWaitMessage;
 import org.apache.ignite.spi.communication.tcp.messages.NodeIdMessage;
 import 
org.apache.ignite.spi.communication.tcp.messages.RecoveryLastReceivedMessage;
-import org.apache.ignite.spi.discovery.SerializableDataBagItemWrapper;
 import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket;
 import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
 import org.apache.ignite.spi.discovery.tcp.messages.InetAddressMessage;
@@ -386,7 +385,7 @@ public class CoreMessagesProvider extends 
AbstractMessageFactoryProvider {
         register(CacheVersionedValue.class);
         register(KeyedVersionedValue.class);
         register(WALPointer.class);
-        register(SerializableDataBagItemWrapper.class);
+        msgIdx++; // Former 'SerializableDataBagItemWrapper'
         register(GridTopicMessage.class);
         register(GridIntList.class);
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryDataBag.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryDataBag.java
index df44689dff8..0fef06deaef 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryDataBag.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryDataBag.java
@@ -16,14 +16,12 @@
  */
 package org.apache.ignite.spi.discovery;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import org.apache.ignite.internal.GridComponent;
-import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
@@ -47,10 +45,10 @@ public class DiscoveryDataBag {
         boolean hasJoiningNodeData();
 
         /**
-         * @param <T> Data type.
+         * @param <T> Message type.
          * @return Joining node data.
          */
-        <T> T joiningNodeData();
+        <T extends Message> T joiningNodeData();
     }
 
     /**
@@ -61,16 +59,16 @@ public class DiscoveryDataBag {
         UUID joiningNodeId();
 
         /**
-         * @param <T> Data type.
+         * @param <T> Message type.
          * @return Common for all cluster nodes discovery data that is sent to 
the joining node.
          */
-        <T> T commonData();
+        <T extends Message> T commonData();
 
         /**
-         * @param <T> Data type.
+         * @param <T> Message type.
          * @return Discovery data that is mapped to the particular cluster 
node and sent to the joining node.
          */
-        <T> Map<UUID, T> nodeSpecificData();
+        <T extends Message> Map<UUID, T> nodeSpecificData();
     }
 
     /**
@@ -91,10 +89,8 @@ public class DiscoveryDataBag {
         }
 
         /** {@inheritDoc} */
-        @Override @Nullable public <T> T joiningNodeData() {
-            Message dataMsg = joiningNodeData.get(cmpId);
-
-            return SerializableDataBagItemWrapper.unwrapIfNecessary(dataMsg);
+        @Override @Nullable public <T extends Message> T joiningNodeData() {
+            return (T)joiningNodeData.get(cmpId);
         }
 
         /**
@@ -122,16 +118,16 @@ public class DiscoveryDataBag {
         }
 
         /** {@inheritDoc} */
-        @Override @Nullable public <T> T commonData() {
+        @Override @Nullable public <T extends Message> T commonData() {
             if (commonData != null)
-                return 
SerializableDataBagItemWrapper.unwrapIfNecessary(commonData.get(cmpId));
+                return (T)commonData.get(cmpId);
 
             return null;
         }
 
         /** {@inheritDoc} */
-        @Override public <T> Map<UUID, T> nodeSpecificData() {
-            return F.viewReadOnly(nodeSpecificData, 
SerializableDataBagItemWrapper::unwrapIfNecessary);
+        @Override public <T extends Message> Map<UUID, T> nodeSpecificData() {
+            return (Map<UUID, T>)nodeSpecificData;
         }
 
         /**
@@ -248,14 +244,6 @@ public class DiscoveryDataBag {
         return newJoinerData;
     }
 
-    /**
-     * @param cmpId Component ID.
-     * @param data Serializable data.
-     */
-    public void addJoiningNodeData(Integer cmpId, Serializable data) {
-        joiningNodeData.put(cmpId, new SerializableDataBagItemWrapper(data));
-    }
-
     /**
      * @param cmpId Component ID.
      * @param data Message data.
@@ -264,14 +252,6 @@ public class DiscoveryDataBag {
         joiningNodeData.put(cmpId, data);
     }
 
-    /**
-     * @param cmpId Component ID.
-     * @param data Serializable data.
-     */
-    public void addGridCommonData(Integer cmpId, Serializable data) {
-        commonData.put(cmpId, new SerializableDataBagItemWrapper(data));
-    }
-
     /**
      * @param cmpId Component ID.
      * @param data Message data.
@@ -309,7 +289,7 @@ public class DiscoveryDataBag {
     }
 
     /**
-     * @param cmnData Cmn data.
+     * @param cmnData Common data.
      */
     public void commonData(Map<Integer, Message> cmnData) {
         commonData.putAll(cmnData);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/SerializableDataBagItemWrapper.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/SerializableDataBagItemWrapper.java
deleted file mode 100644
index 09b2f64485b..00000000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/SerializableDataBagItemWrapper.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.discovery;
-
-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.util.tostring.GridToStringExclude;
-import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.marshaller.Marshaller;
-import org.apache.ignite.plugin.extensions.communication.Message;
-import org.jetbrains.annotations.Nullable;
-
-/** Wrapper message for serializable data in a {@link DiscoveryDataBag}. */
-public class SerializableDataBagItemWrapper implements MarshallableMessage {
-    /** */
-    @GridToStringInclude
-    private Serializable data;
-
-    /** */
-    @GridToStringExclude
-    @Order(0)
-    byte[] dataBytes;
-
-    /** Unmarshalling error. */
-    IgniteCheckedException unmarshallError;
-
-    /** */
-    public SerializableDataBagItemWrapper() {}
-
-    /**
-     * @param data Original data.
-     */
-    public SerializableDataBagItemWrapper(Serializable data) {
-        this.data = data;
-    }
-
-    /**
-     * @param msg Message.
-     * @param <T> Type of data.
-     *
-     * @return Original message or data unwrapped from an 
SerializableDataBagItemWrapper wrapper.
-     */
-    static @Nullable <T> T unwrapIfNecessary(@Nullable Message msg) {
-        if (msg == null)
-            return null;
-
-        return msg instanceof SerializableDataBagItemWrapper ? 
((SerializableDataBagItemWrapper)msg).unwrap() : (T)msg;
-    }
-
-    /**
-     * @param <T> Type of data.
-     *
-     * @return Original data unwrapped from a message.
-     */
-    private <T> T unwrap() {
-        return (T)(data);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void marshal(Marshaller marsh) throws 
IgniteCheckedException {
-        if (data != null)
-            dataBytes = U.marshal(marsh, data);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void unmarshal(Marshaller marsh, ClassLoader clsLdr) 
throws IgniteCheckedException {
-        if (dataBytes != null) {
-            try {
-                data = U.unmarshal(marsh, dataBytes, clsLdr);
-
-                dataBytes = null;
-            }
-            catch (IgniteCheckedException e) {
-                unmarshallError = e;
-            }
-        }
-    }
-
-    /** @return Unmarshalling error. */
-    public IgniteCheckedException unmarshallError() {
-        return unmarshallError;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(SerializableDataBagItemWrapper.class, this);
-    }
-}
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 1356c3d04d2..aa6e42a0236 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
@@ -116,7 +116,6 @@ import org.apache.ignite.spi.IgniteSpiContext;
 import org.apache.ignite.spi.IgniteSpiException;
 import org.apache.ignite.spi.IgniteSpiOperationTimeoutHelper;
 import org.apache.ignite.spi.IgniteSpiThread;
-import org.apache.ignite.spi.discovery.DiscoveryDataBag;
 import org.apache.ignite.spi.discovery.DiscoveryNotification;
 import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
 import org.apache.ignite.spi.discovery.DiscoverySpiListener;
@@ -4578,16 +4577,7 @@ class ServerImpl extends TcpDiscoveryImpl {
 
         /** */
         private IgniteNodeValidationResult 
validateByIgniteComponentsWithJoiningNodeData(TcpDiscoveryJoinRequestMessage 
req) {
-            DiscoveryDataPacket packet = req.gridDiscoveryData();
-
-            try {
-                DiscoveryDataBag dataBag = packet.bagWithJoiningNodeData(log, 
ctx.config().isClientMode());
-
-                return spi.getSpiContext().validateNode(req.node(), dataBag);
-            }
-            catch (IgniteCheckedException e) {
-                return new IgniteNodeValidationResult(req.node().id(), 
e.getMessage());
-            }
+            return spi.getSpiContext().validateNode(req.node(), 
req.gridDiscoveryData().bagWithJoiningNodeData());
         }
 
         /** */
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 314ded00d8e..17352d1f72b 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
@@ -115,7 +115,6 @@ import org.jetbrains.annotations.TestOnly;
 
 import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_CONSISTENT_ID_BY_HOST_WITHOUT_PORT;
 import static org.apache.ignite.IgniteSystemProperties.getBoolean;
-import static org.apache.ignite.failure.FailureType.CRITICAL_ERROR;
 import static 
org.apache.ignite.internal.managers.discovery.GridDiscoveryManager.DISCO_METRICS;
 
 /**
@@ -2113,17 +2112,10 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter 
implements IgniteDiscovery
 
         DiscoveryDataBag dataBag;
 
-        try {
-            if (dataPacket.joiningNodeId().equals(locNode.id()))
-                dataBag = dataPacket.bagWithNodeData(ignite.log(), 
ignite.configuration().isClientMode());
-            else
-                dataBag = dataPacket.bagWithJoiningNodeData(ignite.log(), 
ignite.configuration().isClientMode());
-        }
-        catch (IgniteCheckedException e) {
-            ignite.context().failure().process(new 
FailureContext(CRITICAL_ERROR, e));
-
-            throw new IgniteException(e);
-        }
+        if (dataPacket.joiningNodeId().equals(locNode.id()))
+            dataBag = dataPacket.bagWithNodeData();
+        else
+            dataBag = dataPacket.bagWithJoiningNodeData();
 
         exchange.onExchange(dataBag);
     }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java
index cd1e8c10da3..e5c1a09bc99 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java
@@ -17,24 +17,13 @@
 package org.apache.ignite.spi.discovery.tcp.internal;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.UUID;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.internal.Compress;
-import org.apache.ignite.internal.GridComponent;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.X;
-import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.spi.discovery.DiscoveryDataBag;
-import org.apache.ignite.spi.discovery.SerializableDataBagItemWrapper;
-import org.jetbrains.annotations.Nullable;
-
-import static java.lang.Boolean.TRUE;
-import static 
org.apache.ignite.internal.GridComponent.DiscoveryDataExchangeType.CONTINUOUS_PROC;
 
 /**
  * Carries discovery data in form of {@link Message}
@@ -63,9 +52,6 @@ public class DiscoveryDataPacket implements Message {
     /** */
     private boolean joiningNodeClient;
 
-    /** Unmarshalling error, if any. */
-    private IgniteCheckedException unmarshErr;
-
     /** Constructor. */
     public DiscoveryDataPacket() {
         // No-op.
@@ -107,15 +93,8 @@ public class DiscoveryDataPacket implements Message {
             joiningNodeData.putAll(bag.joiningNodeData());
     }
 
-    /**
-     * @param log Ignite logger.
-     * @param client Client mode flag.
-     *
-     * @return Data bag with node data.
-     */
-    public DiscoveryDataBag bagWithNodeData(IgniteLogger log, Boolean client) 
throws IgniteCheckedException {
-        checkUnmarshallingErrors(log, client);
-
+    /** @return Data bag with node data. */
+    public DiscoveryDataBag bagWithNodeData() {
         DiscoveryDataBag dataBag = new DiscoveryDataBag(joiningNodeId, 
joiningNodeClient);
 
         if (!F.isEmpty(commonData))
@@ -127,15 +106,8 @@ public class DiscoveryDataPacket implements Message {
         return dataBag;
     }
 
-    /**
-     * @param log Ignite logger.
-     * @param client Client mode flag.
-     *
-     * @return Data bag with joining node data.
-     */
-    public DiscoveryDataBag bagWithJoiningNodeData(IgniteLogger log, @Nullable 
Boolean client) throws IgniteCheckedException {
-        checkUnmarshallingErrors(log, client);
-
+    /** @return Data bag with joining node data. */
+    public DiscoveryDataBag bagWithJoiningNodeData() {
         DiscoveryDataBag dataBag = new DiscoveryDataBag(joiningNodeId, 
joiningNodeClient);
 
         if (!F.isEmpty(joiningNodeData))
@@ -158,71 +130,6 @@ public class DiscoveryDataPacket implements Message {
         return nodeSpecificData.containsKey(nodeId);
     }
 
-    /**
-     * Dumps and throws caught unmarshalling errors.
-     *
-     * @param log Ignite logger.
-     * @param client Client mode flag.
-     * @throws IgniteCheckedException If unmarshalling errors occurs.
-     */
-    public void checkUnmarshallingErrors(IgniteLogger log, @Nullable Boolean 
client)
-        throws IgniteCheckedException {
-        if (unmarshErr != null)
-            throw unmarshErr;
-
-        Iterator<Map.Entry<Integer, Message>> dataIter = 
compoundDataIterator();
-
-        IgniteCheckedException err = null;
-
-        while (dataIter.hasNext()) {
-            Map.Entry<Integer, Message> item = dataIter.next();
-
-            if (item.getValue() instanceof SerializableDataBagItemWrapper 
wrapper) {
-                int cmpId = item.getKey();
-
-                IgniteCheckedException e = wrapper.unmarshallError();
-
-                if (e != null) {
-                    if (CONTINUOUS_PROC.ordinal() == cmpId && X.hasCause(e, 
ClassNotFoundException.class) && TRUE.equals(client)) {
-                        U.warn(log, "Failed to unmarshal continuous query 
remote filter on client node. " +
-                            "Can be ignored.");
-
-                        continue;
-                    }
-                    else if (cmpId < 
GridComponent.DiscoveryDataExchangeType.VALUES.length) {
-                        U.error(log, "Failed to unmarshal discovery data for 
component: " +
-                            
GridComponent.DiscoveryDataExchangeType.VALUES[cmpId], e);
-                    }
-                    else {
-                        U.warn(log, "Failed to unmarshal discovery data." +
-                            " Component " + cmpId + " is not found.", e);
-                    }
-
-                    if (err == null)
-                        err = e;
-                    else
-                        err.addSuppressed(e);
-                }
-            }
-        }
-
-        if (err != null) {
-            unmarshErr = err;
-
-            throw err;
-        }
-    }
-
-    /** @return Iterator through all messages, stored in DataPacket. */
-    private Iterator<Map.Entry<Integer, Message>> compoundDataIterator() {
-        return F.concat(joiningNodeData.entrySet().iterator(),
-            commonData.entrySet().iterator(),
-            nodeSpecificData.values()
-                .stream()
-                .flatMap(m -> m.entrySet().stream())
-                .iterator());
-    }
-
     /**
      * Returns {@link DiscoveryDataBag} aware of components with already 
initialized common data
      * (e.g. on nodes prior in cluster to the one where this method is called).
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoDataBagWrapper.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoDataBagWrapper.java
index 28a188ec0ca..c2beff2dcc2 100644
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoDataBagWrapper.java
+++ 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoDataBagWrapper.java
@@ -18,11 +18,9 @@
 package org.apache.ignite.spi.discovery.zk.internal;
 
 import java.util.Map;
-import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
-import org.apache.ignite.spi.discovery.SerializableDataBagItemWrapper;
 
 /** Data bag data holder. */
 public class ZkDiscoDataBagWrapper implements Message {
@@ -30,9 +28,6 @@ public class ZkDiscoDataBagWrapper implements Message {
     @Order(0)
     Map<Integer, Message> data;
 
-    /** */
-    private IgniteCheckedException unmarshErr;
-
     /** Default constructor for {@link MessageFactory}. */
     public ZkDiscoDataBagWrapper() {
         // No-op.
@@ -42,36 +37,4 @@ public class ZkDiscoDataBagWrapper implements Message {
     public ZkDiscoDataBagWrapper(Map<Integer, Message> data) {
         this.data = data;
     }
-
-    /**
-     * Returns data or throws caught unmarshalling errors.
-     *
-     * @return Data.
-     * @throws IgniteCheckedException Unmarshalling exception, if any.
-     */
-    public Map<Integer, Message> unmarshalledData() throws 
IgniteCheckedException {
-        if (unmarshErr != null)
-            throw unmarshErr;
-
-        IgniteCheckedException err = null;
-
-        for (Message msg : data.values()) {
-            if (msg instanceof SerializableDataBagItemWrapper wrapper && 
wrapper.unmarshallError() != null) {
-                IgniteCheckedException e = wrapper.unmarshallError();
-
-                if (err == null)
-                    err = e;
-                else
-                    err.addSuppressed(e);
-            }
-        }
-
-        if (err != null) {
-            unmarshErr = err;
-
-            throw err;
-        }
-
-        return data;
-    }
 }
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
index 87799c52e3c..e8997b68759 100644
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
+++ 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
@@ -3042,7 +3042,7 @@ public class ZookeeperDiscoveryImpl {
 
             DiscoveryDataBag dataBag = new DiscoveryDataBag(locNode.id(), 
locNode.isClient());
 
-            dataBag.commonData(zkDataBagWrapper.unmarshalledData());
+            dataBag.commonData(zkDataBagWrapper.data);
 
             exchange.onExchange(dataBag);
 

Reply via email to