Skip to content

Fix PartitionedDispatcher to use List for partitions #10290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 6, 2025
Merged

Fix PartitionedDispatcher to use List for partitions #10290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions ...-core/src/main/java/org/springframework/integration/dispatcher/PartitionedDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
package org.springframework.integration.dispatcher;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
Expand Down Expand Up @@ -60,7 +58,7 @@
*/
public class PartitionedDispatcher extends AbstractDispatcher {

private final Map<Integer, UnicastingDispatcher> partitions = new HashMap<>();
private final List<UnicastingDispatcher> partitions = new ArrayList<>();

private final List<ExecutorService> executors = new ArrayList<>();

Expand Down Expand Up @@ -164,7 +162,6 @@ public void shutdown() {
}

@Override
@SuppressWarnings("NullAway") // The partitions map never returns null according to partition hash
public boolean dispatch(Message<?> message) {
populatedPartitions();
int partition = Math.abs(this.partitionKeyFunction.apply(message).hashCode()) % this.partitionCount;
Expand All @@ -177,11 +174,9 @@ private void populatedPartitions() {
this.lock.lock();
try {
if (this.partitions.isEmpty()) {
Map<Integer, UnicastingDispatcher> partitionsToUse = new HashMap<>();
for (int i = 0; i < this.partitionCount; i++) {
partitionsToUse.put(i, newPartition());
this.partitions.add(newPartition());
}
this.partitions.putAll(partitionsToUse);
}
}
finally {
Expand Down