Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-3018: Fix Http NPE when no application context

Browse Source 
Resolves https://github.com/spring-projects/spring-integration/issues/3018
This commit is contained in:
Gary Russell
2019-08-08 09:34:53 -04:00
committed by Artem Bilan
parent d2fc02065d
commit 8447ce4a35
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-http/src/main/java/org/springframework/integration/http/outbound/AbstractHttpRequestExecutingMessageHandler.java
View File

@@ -34,6 +34,7 @@ import javax.xml.transform.Source;
import org.reactivestreams.Publisher;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression;
@@ -535,7 +536,9 @@ public abstract class AbstractHttpRequestExecutingMessageHandler extends Abstrac
"evaluation resulted in a " + typeClass + ".");
if (type instanceof String && StringUtils.hasText((String) type)) {
try {
type = ClassUtils.forName((String) type, getApplicationContext().getClassLoader());
ApplicationContext applicationContext = getApplicationContext();
type = ClassUtils.forName((String) type,
applicationContext == null ? null : applicationContext.getClassLoader());
}
catch (ClassNotFoundException e) {
throw new IllegalStateException("Cannot load class for name: " + type, e);