Skip to content

Commit 74e8f9f

Browse files
authored
IGNITE-26970 Fix serialization of GridNearTxFinishRequest#miniId (#12503)
1 parent b2fdcea commit 74e8f9f

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ private void finish(int miniId, GridDistributedTxMapping m, boolean commit) {
766766

767767
// If this is the primary node for the keys.
768768
if (n.isLocal()) {
769-
req.miniId(miniId);
769+
req.updateMiniId(miniId);
770770

771771
IgniteInternalFuture<IgniteInternalTx> fut = cctx.tm().txHandler().finish(n.id(), tx, req);
772772

@@ -777,7 +777,7 @@ private void finish(int miniId, GridDistributedTxMapping m, boolean commit) {
777777
else {
778778
FinishMiniFuture fut = new FinishMiniFuture(miniId, m);
779779

780-
req.miniId(fut.futureId());
780+
req.updateMiniId(fut.futureId());
781781

782782
add(fut); // Append new future.
783783

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,18 @@ public int miniId() {
133133
}
134134

135135
/**
136+
* For use only in GridNearTxFinishRequestSerializer.
137+
*
136138
* @param miniId Mini future ID.
137139
*/
138140
public void miniId(int miniId) {
141+
this.miniId = miniId;
142+
}
143+
144+
/**
145+
* @param miniId Mini future ID.
146+
*/
147+
public void updateMiniId(int miniId) {
139148
assert miniId > 0;
140149

141150
this.miniId = miniId;

modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteIoCommunicationMessageSerializationTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,5 @@ public TestIoMessageReader(int capacity) {
6969

7070
return IgniteUuid.randomUuid();
7171
}
72-
73-
/** {@inheritDoc} */
74-
@Override public int readInt() {
75-
super.readInt();
76-
77-
return 1;
78-
}
7972
}
8073
}

0 commit comments

Comments
 (0)