From 58bdb46fc86bbd856144f3a5e885c8c5c1cf3721 Mon Sep 17 00:00:00 2001
From: "igor.petrenko" <igor.petrenko@xenoss.io>
Date: Thu, 18 Dec 2025 13:22:29 +0200
Subject: [PATCH] CE-127 remoting: java.lang.RuntimeException: Class
 java.util.LinkedHashMap$LinkedValues does not implement Serializable or
 externalizable

---
 .../oap-storage/src/main/java/oap/storage/TransactionLog.java  | 3 ++-
 .../src/main/java/oap/storage/TransactionLogImpl.java          | 3 ++-
 pom.xml                                                        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/oap-storage/oap-storage/src/main/java/oap/storage/TransactionLog.java b/oap-storage/oap-storage/src/main/java/oap/storage/TransactionLog.java
index 28e527867..c5344af8b 100644
--- a/oap-storage/oap-storage/src/main/java/oap/storage/TransactionLog.java
+++ b/oap-storage/oap-storage/src/main/java/oap/storage/TransactionLog.java
@@ -5,6 +5,7 @@
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -49,7 +50,7 @@ class ReplicationResult<Id, T> implements Serializable {
         public final ReplicationStatusType type;
         public final Collection<Transaction<Id, T>> data;
 
-        public ReplicationResult( long timestamp, long hash, ReplicationStatusType type, Collection<Transaction<Id, T>> data ) {
+        public ReplicationResult( long timestamp, long hash, ReplicationStatusType type, List<Transaction<Id, T>> data ) {
             this.timestamp = timestamp;
             this.hash = hash;
             this.type = type;
diff --git a/oap-storage/oap-storage/src/main/java/oap/storage/TransactionLogImpl.java b/oap-storage/oap-storage/src/main/java/oap/storage/TransactionLogImpl.java
index d177d64fe..0505f91dd 100644
--- a/oap-storage/oap-storage/src/main/java/oap/storage/TransactionLogImpl.java
+++ b/oap-storage/oap-storage/src/main/java/oap/storage/TransactionLogImpl.java
@@ -5,6 +5,7 @@
 import org.joda.time.DateTimeUtils;
 import org.jspecify.annotations.NonNull;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -83,7 +84,7 @@ public ReplicationResult<Id, Metadata<T>> updatedSince( long timestamp, long has
                 }
             }
 
-            return new ReplicationResult<>( this.timestamp.longValue(), this.hash, ReplicationResult.ReplicationStatusType.CHANGES, list.values() );
+            return new ReplicationResult<>( this.timestamp.longValue(), this.hash, ReplicationResult.ReplicationStatusType.CHANGES, new ArrayList<>( list.values() ) );
         } finally {
             lock.unlock();
         }
diff --git a/pom.xml b/pom.xml
index 52ae63948..b569d5083 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
     </distributionManagement>
 
     <properties>
-        <oap.project.version>25.1.2</oap.project.version>
+        <oap.project.version>25.1.3</oap.project.version>
 
         <oap.deps.config.version>25.0.0</oap.deps.config.version>
         <oap.deps.oap-teamcity.version>25.0.0</oap.deps.oap-teamcity.version>