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

INT-3445: Fix PublisherRegistrar NPE

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3445
This commit is contained in:
Artem Bilan
2014-06-19 09:11:13 +03:00
committed by Gary Russell
parent da6ef048e2
commit d49fbbcf9c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-integration-core/src/main/java/org/springframework/integration/config/PublisherRegistrar.java
View File

@@ -22,6 +22,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -64,15 +65,15 @@ public class PublisherRegistrar implements ImportBeanDefinitionRegistrar {
else {
BeanDefinition beanDefinition = registry.getBeanDefinition(IntegrationContextUtils.PUBLISHER_ANNOTATION_POSTPROCESSOR_NAME);
MutablePropertyValues propertyValues = beanDefinition.getPropertyValues();
RuntimeBeanReference defaultChannel = (RuntimeBeanReference) propertyValues.getPropertyValue("defaultChannel").getValue();
PropertyValue defaultChannelPropertyValue = propertyValues.getPropertyValue("defaultChannel");
if (StringUtils.hasText(value)) {
if (defaultChannel == null) {
if (defaultChannelPropertyValue == null) {
propertyValues.addPropertyValue("defaultChannel", new RuntimeBeanReference(value));
if (logger.isInfoEnabled()) {
logger.info("Setting '@Publisher' default-output-channel to '" + value + "'.");
}
}
else if (!value.equals(defaultChannel.getBeanName())) {
else if (!value.equals(((RuntimeBeanReference) defaultChannelPropertyValue.getValue()).getBeanName())) {
throw new BeanDefinitionStoreException("When more than one enable publisher definition " +
"(@EnablePublisher or <annotation-config>)" +
" is found in the context, they all must have the same 'default-publisher-channel' value.");

2
spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests-context.xml
View File

@@ -9,6 +9,8 @@
<annotation-config/>
<annotation-config/> <!-- Second declaration should not be a problem - see INT-3445 -->
<channel id="input"/>
<channel id="output">