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

INT-4474: ConsumerEndpointFactoryBean: Fix phase

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4474

* Populate proper `Integer.MIN_VALUE` phase for non-`PollingConsumer`s
in the `ConsumerEndpointFactoryBean`

**Cherry-pick to 5.0.x and 4.3.x**
This commit is contained in:
Artem Bilan
2018-05-31 14:17:11 -04:00
committed by Gary Russell
parent 17e794d2c8
commit 03a89337cb
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -57,6 +57,13 @@ import org.springframework.util.StringUtils;
/**
* The {@link FactoryBean} implementation for {@link AbstractEndpoint} population.
* Controls all the necessary properties and lifecycle.
* According the provided {@link MessageChannel} implementation populates
* a {@link PollingConsumer} for the {@link PollableChannel},
* an {@link EventDrivenConsumer} for the {@link SubscribableChannel}
* and {@link ReactiveStreamsConsumer} for all other channel implementations.
*
* @author Mark Fisher
* @author Oleg Zhurakousky
* @author Josh Long
@@ -310,9 +317,15 @@ public class ConsumerEndpointFactoryBean
this.endpoint.setAutoStartup(this.autoStartup);
}
int phase = this.phase;
if (!this.isPhaseSet && this.endpoint instanceof PollingConsumer) {
phase = Integer.MAX_VALUE / 2;
if (!this.isPhaseSet) {
if (this.endpoint instanceof PollingConsumer) {
phase = Integer.MAX_VALUE / 2;
}
else {
phase = Integer.MIN_VALUE;
}
}
this.endpoint.setPhase(phase);
this.endpoint.setRole(this.role);
if (this.taskScheduler != null) {