Skip to content

Commit 4966c2e

Browse files
committed
Fixed MT access to Learning/TeachingSynchronizer fields
Signed-off-by: Artem Ananev <[email protected]>
1 parent 9a90c98 commit 4966c2e

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

platform-sdk/swirlds-common/src/main/java/com/swirlds/common/merkle/synchronization/LearningSynchronizer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,13 @@
4141
import edu.umd.cs.findbugs.annotations.NonNull;
4242
import java.util.ArrayList;
4343
import java.util.Deque;
44-
import java.util.LinkedList;
4544
import java.util.List;
4645
import java.util.Map;
4746
import java.util.Objects;
4847
import java.util.Queue;
4948
import java.util.concurrent.ConcurrentHashMap;
49+
import java.util.concurrent.ConcurrentLinkedDeque;
50+
import java.util.concurrent.ConcurrentLinkedQueue;
5051
import java.util.concurrent.ExecutionException;
5152
import java.util.concurrent.atomic.AtomicInteger;
5253
import java.util.concurrent.atomic.AtomicReference;
@@ -149,8 +150,8 @@ public LearningSynchronizer(
149150
views = new ConcurrentHashMap<>();
150151
final int viewId = viewIdGen.getAndIncrement();
151152
views.put(viewId, nodeTreeView(root));
152-
viewsToInitialize = new LinkedList<>();
153-
rootsToReceive = new LinkedList<>();
153+
viewsToInitialize = new ConcurrentLinkedDeque<>();
154+
rootsToReceive = new ConcurrentLinkedQueue<>();
154155
rootsToReceive.add(root);
155156

156157
this.breakConnection = breakConnection;

platform-sdk/swirlds-common/src/main/java/com/swirlds/common/merkle/synchronization/TeachingSynchronizer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
import edu.umd.cs.findbugs.annotations.NonNull;
3939
import edu.umd.cs.findbugs.annotations.Nullable;
4040
import java.net.SocketException;
41-
import java.util.LinkedList;
4241
import java.util.Map;
4342
import java.util.Objects;
4443
import java.util.Queue;
4544
import java.util.concurrent.ConcurrentHashMap;
45+
import java.util.concurrent.ConcurrentLinkedQueue;
4646
import java.util.concurrent.atomic.AtomicInteger;
4747
import java.util.concurrent.atomic.AtomicReference;
4848
import java.util.function.Consumer;
@@ -148,7 +148,7 @@ public TeachingSynchronizer(
148148
final int viewId = viewIdGen.getAndIncrement();
149149
final TeacherTreeView<?> view = new TeacherPushMerkleTreeView(configuration, root);
150150
views.put(viewId, view);
151-
subtrees = new LinkedList<>();
151+
subtrees = new ConcurrentLinkedQueue<>();
152152
final TeacherSubtree rootSubtree = new TeacherSubtree(root, viewId, view);
153153
subtrees.add(rootSubtree);
154154

0 commit comments

Comments
 (0)