Skip to content

Commit 7cea693

Browse files
chesnokoffzstan
authored andcommitted
IGNITE-28337 Fix serialization of TcpDiscoveryNodeAddedMessage in RingMessageWorker#sendMessageToClients (#13013)
1 parent 7d86f23 commit 7cea693

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
@@ -3255,21 +3255,20 @@ private void sendMessageToClients(TcpDiscoveryAbstractMessage msg) {
32553255
if (clientMsgWorkers.isEmpty())
32563256
return;
32573257

3258-
byte[] msgBytes = null;
3258+
byte[] msgBytes;
32593259

3260-
if (!(msg instanceof TcpDiscoveryNodeAddedMessage)) {
3261-
try {
3262-
msgBytes = clientMsgSer.serializeMessage(msg);
3263-
}
3264-
catch (IgniteCheckedException | IOException e) {
3265-
U.error(log, "Failed to serialize message: " + msg, e);
3260+
try {
3261+
msgBytes = clientMsgSer.serializeMessage(msg);
3262+
}
3263+
catch (IgniteCheckedException | IOException e) {
3264+
U.error(log, "Failed to serialize message: " + msg, e);
32663265

3267-
return;
3268-
}
3266+
return;
32693267
}
32703268

32713269
for (ClientMessageWorker clientMsgWorker : clientMsgWorkers.values()) {
32723270
TcpDiscoveryAbstractMessage msg0 = msg;
3271+
byte[] msgBytes0 = msgBytes;
32733272

32743273
if (msg instanceof TcpDiscoveryNodeAddedMessage) {
32753274
TcpDiscoveryNodeAddedMessage nodeAddedMsg = (TcpDiscoveryNodeAddedMessage)msg;
@@ -3278,10 +3277,19 @@ private void sendMessageToClients(TcpDiscoveryAbstractMessage msg) {
32783277
msg0 = new TcpDiscoveryNodeAddedMessage(nodeAddedMsg);
32793278

32803279
prepareNodeAddedMessage(msg0, clientMsgWorker.clientNodeId, null);
3280+
3281+
try {
3282+
msgBytes0 = clientMsgSer.serializeMessage(msg0);
3283+
}
3284+
catch (IgniteCheckedException | IOException e) {
3285+
U.error(log, "Failed to serialize message: " + msg0, e);
3286+
3287+
return;
3288+
}
32813289
}
32823290
}
32833291

3284-
clientMsgWorker.addMessage(msg0, msgBytes);
3292+
clientMsgWorker.addMessage(msg0, msgBytes0);
32853293
}
32863294
}
32873295
}

0 commit comments

Comments
 (0)