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

Fix Sonar issue from previous commit

Browse Source
This commit is contained in:
Gary Russell
2019-11-21 09:07:21 -05:00
parent f80ecf17fa
commit ffa199876d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBean.java
View File

@@ -19,6 +19,7 @@ package org.springframework.integration.ip.config;
import java.util.concurrent.Executor;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.context.ApplicationContext;
@@ -155,8 +156,9 @@ public class TcpConnectionFactoryFactoryBean extends AbstractFactoryBean<Abstrac
@Override
protected AbstractConnectionFactory createInstance() {
if (!this.mapperSet) {
this.mapper.setBeanFactory(getBeanFactory());
BeanFactory beanFactory = getBeanFactory();
if (!this.mapperSet && beanFactory != null) {
this.mapper.setBeanFactory(beanFactory);
}
if (this.usingNio) {
if (isServer()) {
@@ -199,7 +201,9 @@ public class TcpConnectionFactoryFactoryBean extends AbstractFactoryBean<Abstrac
this.connectionFactory = factory;
}
}
this.connectionFactory.setBeanFactory(getBeanFactory());
if (beanFactory != null) {
this.connectionFactory.setBeanFactory(beanFactory);
}
if (this.applicationContext != null) {
this.connectionFactory.setApplicationContext(this.applicationContext);
}