From 445dd106b2996de1f16b54c3d577754245b17f42 Mon Sep 17 00:00:00 2001
From: Joshua Kim <kimjos@amazon.com>
Date: Thu, 11 Jun 2020 19:48:24 -0400
Subject: [PATCH] Adding logging

---
 .../amazon/kinesis/leases/LeaseCleanupManager.java         | 7 ++++++-
 1 file changed, 6 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 ba108748..6d6b46a8 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
@@ -157,7 +157,12 @@ public class LeaseCleanupManager {
                 if (CollectionUtils.isNullOrEmpty(childShardKeys)) {
                     try {
                         childShardKeys = getChildShardsFromService(shardInfo, streamIdentifier);
-                        updateLeaseWithChildShards(leasePendingDeletion, childShardKeys);
+
+                        if (childShardKeys == null) {
+                            log.error("No child shards returned from service for shard {} for {}.", shardInfo.shardId(), streamIdentifier.streamName());
+                        } else {
+                            updateLeaseWithChildShards(leasePendingDeletion, childShardKeys);
+                        }
                     } catch (ExecutionException e) {
                         throw exceptionManager.apply(e.getCause());
                     } finally {