From b72b9b01cab69bec73dccd2be7af887f341063c8 Mon Sep 17 00:00:00 2001
From: Monishkumar Gajendran <monishku@amazon.com>
Date: Tue, 5 Oct 2021 10:15:33 -0700
Subject: [PATCH] Fixed failing unit test

---
 .../kinesis/retrieval/polling/PrefetchRecordsPublisher.java     | 1 -
 .../polling/PrefetchRecordsPublisherIntegrationTest.java        | 2 +-
 .../kinesis/retrieval/polling/PrefetchRecordsPublisherTest.java | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisher.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisher.java
index 31d751c5..98829629 100644
--- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisher.java
+++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisher.java
@@ -278,7 +278,6 @@ public class PrefetchRecordsPublisher implements RecordsPublisher {
             // (Re-)Cancel if current thread also interrupted
             executorService.shutdownNow();
         }
-        executorService.shutdownNow();
         started = false;
     }
 
diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisherIntegrationTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisherIntegrationTest.java
index f57a7a3a..3e8d865a 100644
--- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisherIntegrationTest.java
+++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisherIntegrationTest.java
@@ -254,7 +254,7 @@ public class PrefetchRecordsPublisherIntegrationTest {
     public void shutdown() {
         getRecordsCache.shutdown();
         sleep(100L);
-        verify(executorService).shutdownNow();
+        verify(executorService).shutdown();
 //        verify(getRecordsRetrievalStrategy).shutdown();
     }
 
diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisherTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisherTest.java
index f2500867..11c16f3f 100644
--- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisherTest.java
+++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisherTest.java
@@ -770,7 +770,7 @@ public class PrefetchRecordsPublisherTest {
     @After
     public void shutdown() {
         getRecordsCache.shutdown();
-        verify(executorService).shutdownNow();
+        verify(executorService).shutdown();
     }
 
     private void sleep(long millis) {