IGNITE-22736 Fix log buffers position change by unmarshalling process (…

…#4086)
apache · Jul 15, 2024 · 8f510c4 · 8f510c4
1 parent a0811f9
commit 8f510c4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/...ache/ignite/internal/partition/replicator/marshaller/PartitionCommandsMarshallerImpl.java b/...ache/ignite/internal/partition/replicator/marshaller/PartitionCommandsMarshallerImpl.java
@@ -43,6 +43,8 @@ protected void beforeWriteMessage(Object o, ByteBuffer buffer) {
 
     @Override
     public <T> T unmarshall(ByteBuffer raw) {
+        raw = raw.duplicate();
+
         int requiredCatalogVersion = readRequiredCatalogVersion(raw);
 
         T res = super.unmarshall(raw);

diff --git a/.../org/apache/ignite/internal/table/distributed/schema/PartitionCommandsMarshallerImpl.java b/.../org/apache/ignite/internal/table/distributed/schema/PartitionCommandsMarshallerImpl.java
@@ -43,6 +43,8 @@ protected void beforeWriteMessage(Object o, ByteBuffer buffer) {
 
     @Override
     public <T> T unmarshall(ByteBuffer raw) {
+        raw = raw.duplicate();
+
         int requiredCatalogVersion = readRequiredCatalogVersion(raw);
 
         T res = super.unmarshall(raw);

diff --git a/.../apache/ignite/internal/table/distributed/schema/PartitionCommandsMarshallerImplTest.java b/.../apache/ignite/internal/table/distributed/schema/PartitionCommandsMarshallerImplTest.java
@@ -107,11 +107,13 @@ void deserializationWorks() {
         NetworkMessage message = commandWithRequiredCatalogVersion(42);
 
         byte[] serialized = partitionCommandsMarshaller.marshall(message);
+        ByteBuffer buffer = ByteBuffer.wrap(serialized);
 
-        FinishTxCommand unmarshalled = partitionCommandsMarshaller.unmarshall(serialized);
+        FinishTxCommand unmarshalled = partitionCommandsMarshaller.unmarshall(buffer);
 
         assertThat(unmarshalled.requiredCatalogVersion(), is(42));
+        assertThat(buffer.position(), is(0));
 
-        assertThat(partitionCommandsMarshaller.readRequiredCatalogVersion(ByteBuffer.wrap(serialized)), is(42));
+        assertThat(partitionCommandsMarshaller.readRequiredCatalogVersion(buffer), is(42));
     }
 }