SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-1454: Fix NonNullApi Violation

Browse Source 
Fixes https://github.com/spring-cloud/spring-cloud-stream/issues/1454
Resolves #1455
This commit is contained in:
Gary Russell
2018-08-24 14:04:55 -04:00
committed by Oleg Zhurakousky
parent 83f791a07a
commit eceeb9c168
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/DefaultPollableMessageSource.java
View File

@@ -31,6 +31,7 @@ import org.springframework.core.ParameterizedTypeReference;
import org.springframework.integration.StaticMessageHeaderAccessor;
import org.springframework.integration.acks.AckUtils;
import org.springframework.integration.acks.AcknowledgmentCallback;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.support.DefaultErrorMessageStrategy;
@@ -62,6 +63,12 @@ import org.springframework.util.Assert;
*/
public class DefaultPollableMessageSource implements PollableMessageSource, Lifecycle, RetryListener {
private static final DirectChannel dummyChannel = new DirectChannel();
static {
dummyChannel.setBeanName("dummy.required.by.nonnull.api");
}
protected static final ThreadLocal<AttributeAccessor> attributesHolder = new ThreadLocal<AttributeAccessor>();
private final List<ChannelInterceptor> interceptors = new ArrayList<>();
@@ -103,7 +110,7 @@ public class DefaultPollableMessageSource implements PollableMessageSource, Life
if (result instanceof Message) {
Message<?> received = (Message<?>) result;
for (ChannelInterceptor interceptor : this.interceptors) {
received = interceptor.preSend(received, null);
received = interceptor.preSend(received, dummyChannel);
if (received == null) {
return null;
}