From ef1d7be020841c6dd3f66f836ff697a2079ffdf0 Mon Sep 17 00:00:00 2001 From: Denis Kilchichakov Date: Mon, 29 Jul 2019 23:27:16 +0300 Subject: [PATCH] Fix nullability issue in queuechannel (#3012) * Added inherited @Nullable to QueueChannel.doReceive * Minor refactoring --- .../org/springframework/integration/channel/QueueChannel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java index 0f10d9ae88..2cbc7deca7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java @@ -110,6 +110,7 @@ public class QueueChannel extends AbstractPollableChannel implements QueueChanne } @Override + @Nullable protected Message doReceive(long timeout) { try { if (timeout > 0) { @@ -166,7 +167,7 @@ public class QueueChannel extends AbstractPollableChannel implements QueueChanne ((BlockingQueue>) this.queue).drainTo(clearedMessages); } else { - Message message = null; + Message message; while ((message = this.queue.poll()) != null) { clearedMessages.add(message); }