From 3be50b1b2bb16750539e1123eea1fce94948d410 Mon Sep 17 00:00:00 2001
From: Luca Burgazzoli <lburgazzoli@gmail.com>
Date: Sun, 13 Jun 2021 10:59:53 +0200
Subject: [PATCH] fix: event handler waits a long time before terminating #436

---
 .../operator/processing/DefaultEventHandler.java              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java
index 3257ea5707..e5a97b80de 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java
@@ -43,9 +43,8 @@ public class DefaultEventHandler implements EventHandler {
   private final Map<String, RetryExecution> retryState = new HashMap<>();
   private final String controllerName;
   private final int terminationTimeout;
-  private DefaultEventSourceManager eventSourceManager;
-
   private final ReentrantLock lock = new ReentrantLock();
+  private DefaultEventSourceManager eventSourceManager;
 
   public DefaultEventHandler(
       ResourceController controller, ControllerConfiguration configuration, MixedOperation client) {
@@ -91,6 +90,7 @@ private DefaultEventHandler(
   public void close() {
     try {
       log.debug("Closing handler for {}", controllerName);
+      executor.shutdown();
       executor.awaitTermination(terminationTimeout, TimeUnit.SECONDS);
     } catch (InterruptedException e) {
       log.debug("Exception closing handler for {}: {}", controllerName, e.getLocalizedMessage());