Skip to content

Commit de92264

Browse files
yybmionartembilan
authored andcommitted
Fix null check in CompositeExecutor ctor
Fixes: #10575 Error in the `CompositeExecutor` constructor where `primaryTaskExecutor` was being validated twice instead of validating `secondaryTaskExecutor`. Signed-off-by: Yoobin Yoon <[email protected]> **Auto-cherry-pick to `6.4.x`**
1 parent 413246a commit de92264

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

spring-integration-core/src/main/java/org/springframework/integration/util/CompositeExecutor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
* executors.
3636
*
3737
* @author Gary Russell
38+
* @author Yoobin Yoon
3839
* @since 3.0.3
3940
*
4041
*/
@@ -46,7 +47,7 @@ public class CompositeExecutor implements Executor {
4647

4748
public CompositeExecutor(Executor primaryTaskExecutor, Executor secondaryTaskExecutor) {
4849
Assert.notNull(primaryTaskExecutor, "'primaryTaskExecutor' cannot be null");
49-
Assert.notNull(primaryTaskExecutor, "'secondaryTaskExecutor' cannot be null");
50+
Assert.notNull(secondaryTaskExecutor, "'secondaryTaskExecutor' cannot be null");
5051
this.primaryTaskExecutor = primaryTaskExecutor;
5152
this.secondaryTaskExecutor = secondaryTaskExecutor;
5253
}

0 commit comments

Comments
 (0)