From 374e47b208afccfbb0ca346bb73e54b12d270437 Mon Sep 17 00:00:00 2001
From: Ashwin Giridharan <girida@amazon.com>
Date: Mon, 15 Jun 2020 23:13:47 -0700
Subject: [PATCH] updating wereChildShardsPresent hint in all cases

---
 .../software/amazon/kinesis/leases/LeaseCleanupManager.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/LeaseCleanupManager.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/LeaseCleanupManager.java
index 4fda2106..0a2b65eb 100644
--- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/LeaseCleanupManager.java
+++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/leases/LeaseCleanupManager.java
@@ -173,9 +173,10 @@ public class LeaseCleanupManager {
                     try {
                         childShardKeys = getChildShardsFromService(shardInfo, streamIdentifier);
 
-                        if (childShardKeys == null) {
+                        if (CollectionUtils.isNullOrEmpty(childShardKeys)) {
                             log.error("No child shards returned from service for shard {} for {}.", shardInfo.shardId(), streamIdentifier.streamName());
                         } else {
+                            wereChildShardsPresent = true;
                             updateLeaseWithChildShards(leasePendingDeletion, childShardKeys);
                         }
                     } catch (ExecutionException e) {
@@ -183,6 +184,8 @@ public class LeaseCleanupManager {
                     } finally {
                         alreadyCheckedForGarbageCollection = true;
                     }
+                } else {
+                    wereChildShardsPresent = true;
                 }
                 cleanedUpCompletedLease = cleanupLeaseForCompletedShard(lease, shardInfo, childShardKeys);
             }