Handle No Lease, and Lease Loss in requestShutdown.

src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ConsumerStates.java

@@ -355,7 +355,7 @@ static class ShutdownNotificationState implements ConsumerState {
         @Override
         public ITask createTask(ShardConsumer consumer) {
             return new ShutdownNotificationTask(consumer.getRecordProcessor(), consumer.getRecordProcessorCheckpointer(),
-                    consumer.getShutdownNotification());
+                    consumer.getShutdownNotification(), consumer.getShardInfo());
         }
 
         @Override

src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/ShutdownNotificationTask.java

@@ -12,11 +12,13 @@ class ShutdownNotificationTask implements ITask {
     private final IRecordProcessor recordProcessor;
     private final IRecordProcessorCheckpointer recordProcessorCheckpointer;
     private final ShutdownNotification shutdownNotification;
+    private final ShardInfo shardInfo;
 
-    ShutdownNotificationTask(IRecordProcessor recordProcessor, IRecordProcessorCheckpointer recordProcessorCheckpointer, ShutdownNotification shutdownNotification) {
+    ShutdownNotificationTask(IRecordProcessor recordProcessor, IRecordProcessorCheckpointer recordProcessorCheckpointer, ShutdownNotification shutdownNotification, ShardInfo shardInfo) {
         this.recordProcessor = recordProcessor;
         this.recordProcessorCheckpointer = recordProcessorCheckpointer;
         this.shutdownNotification = shutdownNotification;
+        this.shardInfo = shardInfo;
     }
 
     @Override

src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/Worker.java

@@ -538,15 +538,18 @@ private List<ShardInfo> getShardInfoForAssignments() {
      */
     public Future<Void> requestShutdown() {
 
-        leaseCoordinator.stopLeaseTaker();
         //
-        // Stop accepting new leases
+        // Stop accepting new leases.  Once we do this we can be sure that
+        // no more leases will be acquired.
         //
+        leaseCoordinator.stopLeaseTaker();
+
         Collection<KinesisClientLease> leases = leaseCoordinator.getAssignments();
         if (leases == null || leases.isEmpty()) {
             //
-            // If there are no leases shutdown is already completed.
+            // If there are no leases notification is already completed, but we still need to shutdown the worker.
             //
+            this.shutdown();
             return Futures.immediateFuture(null);
         }
         CountDownLatch shutdownCompleteLatch = new CountDownLatch(leases.size());
@@ -555,7 +558,18 @@ public Future<Void> requestShutdown() {
             ShutdownNotification shutdownNotification = new ShardConsumerShutdownNotification(leaseCoordinator, lease,
                     notificationCompleteLatch, shutdownCompleteLatch);
             ShardInfo shardInfo = KinesisClientLibLeaseCoordinator.convertLeaseToAssignment(lease);
-            shardInfoShardConsumerMap.get(shardInfo).notifyShutdownRequested(shutdownNotification);
+            ShardConsumer consumer = shardInfoShardConsumerMap.get(shardInfo);
+            if (consumer != null) {
+                consumer.notifyShutdownRequested(shutdownNotification);
+            } else {
+                //
+                // There is a race condition between retrieving the current assignments, and creating the
+                // notification.  If the a lease is lost in between these two points, we explicitly decrement the
+                // notification latches to clear the shutdown.
+                //
+                notificationCompleteLatch.countDown();
+                shutdownCompleteLatch.countDown();
+            }
         }
 
         return new ShutdownFuture(shutdownCompleteLatch, notificationCompleteLatch, this);
@@ -622,9 +636,11 @@ private void finalShutdown() {
     /**
      * Returns whether worker can shutdown immediately. Note that this method is called from Worker's {{@link #run()}
      * method before every loop run, so method must do minimum amount of work to not impact shard processing timings.
+     * 
      * @return Whether worker should shutdown immediately.
      */
-    private boolean shouldShutdown() {
+    @VisibleForTesting
+    boolean shouldShutdown() {
         if (executorService.isShutdown()) {
             LOG.error("Worker executor service has been shutdown, so record processors cannot be shutdown.");
             return true;