From 3e603185a7978383784224d80b83d4f837f69ed0 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Tue, 26 Jun 2018 16:44:05 -0400
Subject: [PATCH] Fix race condition in KinesisMDCA.doStop()

https://build.spring.io/browse/INTEXT-AWS-158
---
 .../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 607e2c3..3eec15b 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
@@ -658,7 +658,6 @@ public class KinesisMessageDrivenChannelAdapter extends MessageProducerSupport i
 
 	@Override
 	protected void doStop() {
-		this.active = false;
 		for (ConsumerInvoker consumerInvoker : this.consumerInvokers) {
 			consumerInvoker.notifyBarrier();
 		}
@@ -666,6 +665,7 @@ public class KinesisMessageDrivenChannelAdapter extends MessageProducerSupport i
 		stopConsumers();
 
 		this.shardLocksMonitor.stop();
+		this.active = false;
 	}
 
 	private void stopConsumers() {