Skip to content

Commit 18f9615

Browse files
garyrussellartembilan
authored andcommitted
GH-1597: Fix NPE
Resolves #1597 **cherry-pick to 2.5.x** (cherry picked from commit 43742ab)
1 parent 7caa703 commit 18f9615

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
import org.apache.kafka.common.header.internals.RecordHeader;
6868

6969
import org.springframework.beans.BeanUtils;
70+
import org.springframework.context.ApplicationContext;
7071
import org.springframework.core.log.LogAccessor;
7172
import org.springframework.core.task.SimpleAsyncTaskExecutor;
7273
import org.springframework.kafka.KafkaException;
@@ -939,7 +940,11 @@ private boolean checkDeserializer(@Nullable Object deser) {
939940
}
940941
else if (deser instanceof String) {
941942
try {
942-
deserializer = ClassUtils.forName((String) deser, getApplicationContext().getClassLoader());
943+
ApplicationContext applicationContext = getApplicationContext();
944+
ClassLoader classLoader = applicationContext == null
945+
? getClass().getClassLoader()
946+
: applicationContext.getClassLoader();
947+
deserializer = ClassUtils.forName((String) deser, classLoader);
943948
}
944949
catch (ClassNotFoundException | LinkageError e) {
945950
throw new IllegalStateException(e);

0 commit comments

Comments
 (0)