(ignite) branch master updated: IGNITE-26970 Fix serialization of GridNearTxFinishRequest#miniId (#12503)

[shishkovilja]

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 74e8f9f8d3b IGNITE-26970 Fix serialization of 
GridNearTxFinishRequest#miniId (#12503)
74e8f9f8d3b is described below

commit 74e8f9f8d3b70404a43ccdbb3375f5877ed8acca
Author: Dmitry Werner <grimekil...@gmail.com>
AuthorDate: Fri Nov 7 16:58:03 2025 +0500

    IGNITE-26970 Fix serialization of GridNearTxFinishRequest#miniId (#12503)
---
 .../cache/distributed/near/GridNearTxFinishFuture.java           | 4 ++--
 .../cache/distributed/near/GridNearTxFinishRequest.java          | 9 +++++++++
 .../IgniteIoCommunicationMessageSerializationTest.java           | 7 -------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index 8b4a30e2822..c4049320dd6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -766,7 +766,7 @@ public final class GridNearTxFinishFuture<K, V> extends 
GridCacheCompoundIdentit
 
         // If this is the primary node for the keys.
         if (n.isLocal()) {
-            req.miniId(miniId);
+            req.updateMiniId(miniId);
 
             IgniteInternalFuture<IgniteInternalTx> fut = 
cctx.tm().txHandler().finish(n.id(), tx, req);
 
@@ -777,7 +777,7 @@ public final class GridNearTxFinishFuture<K, V> extends 
GridCacheCompoundIdentit
         else {
             FinishMiniFuture fut = new FinishMiniFuture(miniId, m);
 
-            req.miniId(fut.futureId());
+            req.updateMiniId(fut.futureId());
 
             add(fut); // Append new future.
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
index 2b3271b2762..0e7ca32829e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
@@ -133,9 +133,18 @@ public class GridNearTxFinishRequest extends 
GridDistributedTxFinishRequest {
     }
 
     /**
+     * For use only in GridNearTxFinishRequestSerializer.
+     *
      * @param miniId Mini future ID.
      */
     public void miniId(int miniId) {
+        this.miniId = miniId;
+    }
+
+    /**
+     * @param miniId Mini future ID.
+     */
+    public void updateMiniId(int miniId) {
         assert miniId > 0;
 
         this.miniId = miniId;
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteIoCommunicationMessageSerializationTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteIoCommunicationMessageSerializationTest.java
index 6750812a6a1..19b0cfaa18b 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteIoCommunicationMessageSerializationTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteIoCommunicationMessageSerializationTest.java
@@ -69,12 +69,5 @@ public class IgniteIoCommunicationMessageSerializationTest 
extends AbstractCommu
 
             return IgniteUuid.randomUuid();
         }
-
-        /** {@inheritDoc} */
-        @Override public int readInt() {
-            super.readInt();
-
-            return 1;
-        }
     }
 }