From f4f1fe32b4df8a94fc1d73d876eb9e360e083598 Mon Sep 17 00:00:00 2001 From: Kim JaeYeon <48614095+ghgh415263@users.noreply.github.com> Date: Fri, 23 May 2025 02:17:40 +0900 Subject: [PATCH] GH-3917: Fix CommonMixedErrorHandler ctor for proper validation Fixes: #3917 Issue link: https://github.com/spring-projects/spring-kafka/issues/3917 * Fixed a null check issue in the constructor of `CommonMixedErrorHandler` Signed-off-by: JaeYeon Kim (cherry picked from commit 982b532d98f67ac7419f01e913a1c6471f854d82) --- .../kafka/listener/CommonMixedErrorHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/CommonMixedErrorHandler.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/CommonMixedErrorHandler.java index a5b604c3..3d8bb0b8 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/listener/CommonMixedErrorHandler.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/CommonMixedErrorHandler.java @@ -30,6 +30,7 @@ import org.springframework.util.Assert; * for record and batch listeners. * * @author Gary Russell + * @author JaeYeon Kim * @since 2.8 * */ @@ -46,7 +47,7 @@ public class CommonMixedErrorHandler implements CommonErrorHandler { */ public CommonMixedErrorHandler(CommonErrorHandler recordErrorHandler, CommonErrorHandler batchErrorHandler) { Assert.notNull(recordErrorHandler, "'recordErrorHandler' cannot be null"); - Assert.notNull(recordErrorHandler, "'batchErrorHandler' cannot be null"); + Assert.notNull(batchErrorHandler, "'batchErrorHandler' cannot be null"); this.recordErrorHandler = recordErrorHandler; this.batchErrorHandler = batchErrorHandler; }