Fix race condition in KinesisMDCA.doStop()

https://build.spring.io/browse/INTEXT-AWS-158
2018-06-26 16:44:05 -04:00
parent 4fe8e4c6a5
commit 3e603185a7
1 changed files with 1 additions and 1 deletions
--- 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() {