Skip to content

Commit cc8c95f

Browse files
authored
IGNITE-28337 Fix serialization of TcpDiscoveryNodeAddedMessage in RingMessageWorker#sendMessageToClients (#13013)
1 parent 197a144 commit cc8c95f

1 file changed

Lines changed: 18 additions & 10 deletions

File tree

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

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

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3289,21 +3289,20 @@ private void sendMessageToClients(TcpDiscoveryAbstractMessage msg) {
32893289
if (clientMsgWorkers.isEmpty())
32903290
return;
32913291

3292-
byte[] msgBytes = null;
3292+
byte[] msgBytes;
32933293

3294-
if (!(msg instanceof TcpDiscoveryNodeAddedMessage)) {
3295-
try {
3296-
msgBytes = clientMsgSer.serializeMessage(msg);
3297-
}
3298-
catch (IgniteCheckedException | IOException e) {
3299-
U.error(log, "Failed to serialize message: " + msg, e);
3294+
try {
3295+
msgBytes = clientMsgSer.serializeMessage(msg);
3296+
}
3297+
catch (IgniteCheckedException | IOException e) {
3298+
U.error(log, "Failed to serialize message: " + msg, e);
33003299

3301-
return;
3302-
}
3300+
return;
33033301
}
33043302

33053303
for (ClientMessageWorker clientMsgWorker : clientMsgWorkers.values()) {
33063304
TcpDiscoveryAbstractMessage msg0 = msg;
3305+
byte[] msgBytes0 = msgBytes;
33073306

33083307
if (msg instanceof TcpDiscoveryNodeAddedMessage) {
33093308
TcpDiscoveryNodeAddedMessage nodeAddedMsg = (TcpDiscoveryNodeAddedMessage)msg;
@@ -3312,10 +3311,19 @@ private void sendMessageToClients(TcpDiscoveryAbstractMessage msg) {
33123311
msg0 = new TcpDiscoveryNodeAddedMessage(nodeAddedMsg);
33133312

33143313
prepareNodeAddedMessage(msg0, clientMsgWorker.clientNodeId, null);
3314+
3315+
try {
3316+
msgBytes0 = clientMsgSer.serializeMessage(msg0);
3317+
}
3318+
catch (IgniteCheckedException | IOException e) {
3319+
U.error(log, "Failed to serialize message: " + msg0, e);
3320+
3321+
return;
3322+
}
33153323
}
33163324
}
33173325

3318-
clientMsgWorker.addMessage(msg0, msgBytes);
3326+
clientMsgWorker.addMessage(msg0, msgBytes0);
33193327
}
33203328
}
33213329
}

0 commit comments

Comments
 (0)