fix

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java

@@ -130,7 +130,8 @@ public ExecutorService getExecutorService() {
 
       @Override
       public ExecutorService getWorkflowExecutorService() {
-        return workflowExecutorService != null ? workflowExecutorService : original.getWorkflowExecutorService();
+        return workflowExecutorService != null ? workflowExecutorService
+            : original.getWorkflowExecutorService();
       }
 
       @Override

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ExecutorServiceManager.java

@@ -76,13 +76,16 @@ private void doStop() {
     try {
       log.debug("Closing executor");
       executor.shutdown();
-      workflowExecutor.shutdown();
-      if (!executor.awaitTermination(terminationTimeoutSeconds, TimeUnit.SECONDS)) {
-        executor.shutdownNow(); // if we timed out, waiting, cancel everything
+      if (workflowExecutor != null) {
+        workflowExecutor.shutdown();
+        if (!workflowExecutor.awaitTermination(terminationTimeoutSeconds, TimeUnit.SECONDS)) {
+          workflowExecutor.shutdownNow(); // if we timed out, waiting, cancel everything
+        }
       }
-      if (!workflowExecutor.awaitTermination(terminationTimeoutSeconds, TimeUnit.SECONDS)) {
+      if (!executor.awaitTermination(terminationTimeoutSeconds, TimeUnit.SECONDS)) {
         executor.shutdownNow(); // if we timed out, waiting, cancel everything
       }
+
     } catch (InterruptedException e) {
       log.debug("Exception closing executor: {}", e.getLocalizedMessage());
     }