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

PollerParser correctly prevents multiple triggers

Browse Source
This commit is contained in:
Mark Fisher
2011-09-27 16:52:00 -04:00
parent 6e662f48eb
commit 037e8aabc1
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-integration-core/src/main/java/org/springframework/integration/config/xml/PollerParser.java
View File

@@ -120,7 +120,7 @@ public class PollerParser extends AbstractBeanDefinitionParser {
}
triggerBeanNames.add(triggerAttribute);
}
else if (StringUtils.hasText(fixedRateAttribute)) {
if (StringUtils.hasText(fixedRateAttribute)) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(PERIODIC_TRIGGER_CLASSNAME);
builder.addConstructorArgValue(fixedRateAttribute);
if (StringUtils.hasText(timeUnit)) {
@@ -131,7 +131,7 @@ public class PollerParser extends AbstractBeanDefinitionParser {
builder.getBeanDefinition(), parserContext.getRegistry());
triggerBeanNames.add(triggerBeanName);
}
else if (StringUtils.hasText(fixedDelayAttribute)) {
if (StringUtils.hasText(fixedDelayAttribute)) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(PERIODIC_TRIGGER_CLASSNAME);
builder.addConstructorArgValue(fixedDelayAttribute);
if (StringUtils.hasText(timeUnit)) {
@@ -142,7 +142,7 @@ public class PollerParser extends AbstractBeanDefinitionParser {
builder.getBeanDefinition(), parserContext.getRegistry());
triggerBeanNames.add(triggerBeanName);
}
else if (StringUtils.hasText(cronAttribute)) {
if (StringUtils.hasText(cronAttribute)) {
if (StringUtils.hasText(timeUnit)) {
parserContext.getReaderContext().error("The 'time-unit' attribute cannot be used with a 'cron' trigger.", pollerElement);
}