# IGNITE-709 Bug fix: message in TcpDiscoveryCustomEventMessage lost. (cherry picked from commit b58752d)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a15f2a10 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a15f2a10 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a15f2a10 Branch: refs/heads/ignite-831 Commit: a15f2a10d4731c5c6ef3045e71ff46cf17eada04 Parents: 76bc371 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Mon Apr 13 12:48:29 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Tue Apr 28 18:21:45 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 11 ++--------- .../tcp/messages/TcpDiscoveryCustomEventMessage.java | 14 +------------- 2 files changed, 3 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a15f2a10/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 d3472cd..26508fa 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 @@ -1255,11 +1255,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov /** {@inheritDoc} */ @Override public void sendCustomEvent(DiscoveryCustomMessage evt) { try { - byte[] msgBytes; - - msgBytes = marsh.marshal(evt); - - msgWorker.addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), evt, msgBytes)); + msgWorker.addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), marsh.marshal(evt))); } catch (IgniteCheckedException e) { throw new IgniteSpiException("Failed to marshal custom event: " + evt, e); @@ -4495,11 +4491,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov TcpDiscoveryNode node = ring.node(msg.creatorNodeId()); - Serializable msgObj = msg.message(); - try { - if (msgObj == null) - msgObj = marsh.unmarshal(msg.messageBytes(), U.gridClassLoader()); + Serializable msgObj = marsh.unmarshal(msg.messageBytes(), U.gridClassLoader()); lsnr.onDiscovery(DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT, msg.topologyVersion(), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a15f2a10/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java index 4e42f2d..3144b93 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java @@ -19,7 +19,6 @@ package org.apache.ignite.spi.discovery.tcp.messages; import org.apache.ignite.internal.util.typedef.internal.*; -import java.io.*; import java.util.*; /** @@ -31,30 +30,19 @@ public class TcpDiscoveryCustomEventMessage extends TcpDiscoveryAbstractMessage private static final long serialVersionUID = 0L; /** */ - private transient Serializable msg; - - /** */ private final byte[] msgBytes; /** * @param creatorNodeId Creator node id. * @param msgBytes Serialized message. */ - public TcpDiscoveryCustomEventMessage(UUID creatorNodeId, Serializable msg, byte[] msgBytes) { + public TcpDiscoveryCustomEventMessage(UUID creatorNodeId, byte[] msgBytes) { super(creatorNodeId); - this.msg = msg; this.msgBytes = msgBytes; } /** - * @return Message. - */ - public Serializable message() { - return msg; - } - - /** * @return Serialized message. */ public byte[] messageBytes() {
