[camel] branch main updated: CAMEL-16841: prevent an NPE when stopping camel-kubernetes config map (#5918)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 9755c60  CAMEL-16841: prevent an NPE when stopping camel-kubernetes 
config map (#5918)
9755c60 is described below

commit 9755c6032c0f5a43298ed1089735ced0dd6e3580
Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com>
AuthorDate: Tue Aug 3 16:07:30 2021 +0200

    CAMEL-16841: prevent an NPE when stopping camel-kubernetes config map 
(#5918)
---
 .../kubernetes/config_maps/KubernetesConfigMapsConsumer.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
index 5df45d0..21b6e37 100644
--- 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
+++ 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
@@ -69,12 +69,12 @@ public class KubernetesConfigMapsConsumer extends 
DefaultConsumer {
         LOG.debug("Stopping Kubernetes ConfigMap Consumer");
         if (executor != null) {
             if (getEndpoint() != null && getEndpoint().getCamelContext() != 
null) {
-                if (configMapWatcher != null) {
+                if (configMapWatcher != null && configMapWatcher.getWatch() != 
null) {
                     configMapWatcher.getWatch().close();
                 }
                 
getEndpoint().getCamelContext().getExecutorServiceManager().shutdownNow(executor);
             } else {
-                if (configMapWatcher != null) {
+                if (configMapWatcher != null && configMapWatcher.getWatch() != 
null) {
                     configMapWatcher.getWatch().close();
                 }
                 executor.shutdownNow();