From b98cea76d0b68ce400451d77b9f586eff53165b7 Mon Sep 17 00:00:00 2001 From: Andrii Chuzhynov Date: Wed, 12 Jan 2022 20:04:19 +0100 Subject: [PATCH] Fix null pointer exception which may happen if shutdown happened before lease have got --- .../software/amazon/kinesis/coordinator/Scheduler.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/Scheduler.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/Scheduler.java index e621376c..c3e7805b 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/Scheduler.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/coordinator/Scheduler.java @@ -763,9 +763,12 @@ public class Scheduler implements Runnable { // Stop accepting new leases. Once we do this we can be sure that // no more leases will be acquired. // - leaseCoordinator.stopLeaseTaker(); + Collection leases = Collections.emptyList(); + if (leaseCoordinator != null) { + leaseCoordinator.stopLeaseTaker(); + leases = leaseCoordinator.getAssignments(); + } - Collection leases = leaseCoordinator.getAssignments(); if (leases == null || leases.isEmpty()) { // // If there are no leases notification is already completed, but we still need to shutdown the worker.