From f771f924b56f149e97c08c40069362e81e498e14 Mon Sep 17 00:00:00 2001
From: Anton Barkan <antlitovka@gmail.com>
Date: Thu, 28 Apr 2022 18:04:23 +0300
Subject: [PATCH] Cancel KinesisMDChA.shCMFuture after active=false

It's misleading to see an error for interrupted `KinesisMessageDrivenChannelAdapter.ShardConsumerManager`
on shutdown.

* Move `this.shardConsumerManagerFuture.cancel(true)` in the `doStop()` after `this.active = false;`
---
 .../aws/inbound/kinesis/KinesisMessageDrivenChannelAdapter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/integration/aws/inbound/kinesis/KinesisMessageDrivenChannelAdapter.java b/src/main/java/org/springframework/integration/aws/inbound/kinesis/KinesisMessageDrivenChannelAdapter.java
index da24e08..ad7475b 100644
--- a/src/main/java/org/springframework/integration/aws/inbound/kinesis/KinesisMessageDrivenChannelAdapter.java
+++ b/src/main/java/org/springframework/integration/aws/inbound/kinesis/KinesisMessageDrivenChannelAdapter.java
@@ -776,8 +776,8 @@ public class KinesisMessageDrivenChannelAdapter extends MessageProducerSupport
 		super.doStop();
 		stopConsumers();
 
-		this.shardConsumerManagerFuture.cancel(true);
 		this.active = false;
+		this.shardConsumerManagerFuture.cancel(true);
 	}
 
 	private void stopConsumers() {