Event handler waits a long time before terminating operator-framework#436

Author: lburgazzoli

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());
@@ -233,7 +233,8 @@ private RetryExecution getOrInitRetryExecution(ExecutionScope executionScope) {
    * <p>Note that this is an improvement, not a bug fix. This situation can happen naturally, we
    * just make the execution more efficient, and avoid questions about conflicts.
    *
-   * <p>Note that without the conditional locking in the cache, there is a very minor chance that we
+   * <p>Note that without the conditional locking in the cache, there is a very minor chance that
+   * we
    * would override an additional change coming from a different client.
    */
   private void cacheUpdatedResourceIfChanged(