Merge 7daae980c0 into 6fc148740d

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

@@ -103,6 +103,8 @@ public class Worker implements Runnable {
     private volatile long shutdownStartTimeMillis;
     private volatile boolean shutdownComplete = false;
     
+    private volatile boolean initialized = false;
+
     // Holds consumers for shards the worker is currently tracking. Key is shard
     // info, value is ShardConsumer.
     private ConcurrentMap<ShardInfo, ShardConsumer> shardInfoShardConsumerMap = new ConcurrentHashMap<ShardInfo, ShardConsumer>();
@@ -543,6 +545,7 @@ public class Worker implements Runnable {
         if (!isDone) {
             throw new RuntimeException(lastException);
         }
+        initialized = true;
     }
 
     /**
@@ -751,6 +754,10 @@ public class Worker implements Runnable {
         return shutdownComplete;
     }
     
+    public boolean isInitialized() {
+        return initialized;
+    }
+
     ConcurrentMap<ShardInfo, ShardConsumer> getShardInfoShardConsumerMap() {
         return shardInfoShardConsumerMap;
     }
@@ -801,6 +808,7 @@ public class Worker implements Runnable {
         if (metricsFactory instanceof WorkerCWMetricsFactory) {
             ((CWMetricsFactory) metricsFactory).shutdown();
         }        
+        initialized = false;
         shutdownComplete = true;        
     }