Fix nullability issue in queuechannel (#3012)

augur · garyrussell · commit ef1d7be02084 · 2019-07-29T16:27:16.000-04:00
* Added inherited @nullable to QueueChannel.doReceive * Minor refactoring
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
@@ -110,6 +110,7 @@ protected boolean doSend(Message<?> message, long timeout) {
 	}
 
 	@Override
+	@Nullable
 	protected Message<?> doReceive(long timeout) {
 		try {
 			if (timeout > 0) {
@@ -166,7 +167,7 @@ public List<Message<?>> clear() {
 			((BlockingQueue<Message<?>>) this.queue).drainTo(clearedMessages);
 		}
 		else {
-			Message<?> message = null;
+			Message<?> message;
 			while ((message = this.queue.poll()) != null) {
 				clearedMessages.add(message);
 			}

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ protected boolean doSend(Message<?> message, long timeout) {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`@Override`
	`113`	`+ @Nullable`
`113`	`114`	`protected Message<?> doReceive(long timeout) {`
`114`	`115`	`try {`
`115`	`116`	`if (timeout > 0) {`
`@@ -166,7 +167,7 @@ public List<Message<?>> clear() {`
`166`	`167`	`((BlockingQueue<Message<?>>) this.queue).drainTo(clearedMessages);`
`167`	`168`	`}`
`168`	`169`	`else {`
`169`		`- Message<?> message = null;`
	`170`	`+ Message<?> message;`
`170`	`171`	`while ((message = this.queue.poll()) != null) {`
`171`	`172`	`clearedMessages.add(message);`
`172`	`173`	`}`