From d2f95cb5edca8b3b6ad69117a801f59e05699e50 Mon Sep 17 00:00:00 2001
From: bencvdb <bencvdb93#gmail.com>
Date: Wed, 26 Jun 2019 13:51:50 -0700
Subject: [PATCH] feature(worker): catch errors from runProcessLoop and
 shutdown

---
 .../kinesis/clientlibrary/lib/worker/Worker.java    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/Worker.java b/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/Worker.java
index 0dbc1e27..60bc15cd 100644
--- a/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/Worker.java
+++ b/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/Worker.java
@@ -489,12 +489,15 @@ public class Worker implements Runnable {
             shutdown();
         }
 
-        while (!shouldShutdown()) {
-            runProcessLoop();
+        try {
+            while (!shouldShutdown()) {
+                runProcessLoop();
+            }
+        }
+        finally {
+            finalShutdown();
+            LOG.info("Worker loop is complete. Exiting from worker.");
         }
-
-        finalShutdown();
-        LOG.info("Worker loop is complete. Exiting from worker.");
     }
 
     @VisibleForTesting