Skip to content

Improve MessageChannelPartitionHandler::receiveReplies #4776

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve MessageChannelPartitionHandler::receiveReplies #4776

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: 6 additions & 3 deletions .../java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2024 the original author or authors.
* Copyright 2009-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,6 +15,7 @@
*/
package org.springframework.batch.integration.partition;

import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
Expand Down Expand Up @@ -83,6 +84,7 @@
* @author Will Schipp
* @author Michael Minella
* @author Mahmoud Ben Hassine
* @author Yanming Zhou
*
*/
@MessageEndpoint
Expand Down Expand Up @@ -286,7 +288,7 @@ private Set<StepExecution> pollReplies(final StepExecution managerStepExecution,

@SuppressWarnings("unchecked")
private Set<StepExecution> receiveReplies(PollableChannel currentReplyChannel) {
Message<Set<StepExecution>> message = (Message<Set<StepExecution>>) messagingGateway
Message<Collection<StepExecution>> message = (Message<Collection<StepExecution>>) messagingGateway
.receive(currentReplyChannel);

if (message == null) {
Expand All @@ -296,7 +298,8 @@ else if (logger.isDebugEnabled()) {
logger.debug("Received replies: " + message);
}

return new HashSet<>(message.getPayload());
Collection<StepExecution> payload = message.getPayload();
return payload instanceof Set ? (Set<StepExecution>) payload : new HashSet<>(message.getPayload());
}

private Message<StepExecutionRequest> createMessage(int sequenceNumber, int sequenceSize,
Expand Down