You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/08/03 14:08:28 UTC
[camel] branch camel-3.11.x updated: CAMEL-16841: prevent an NPE
when stopping camel-kubernetes config map (#5918)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.11.x by this push:
new 56a9a22 CAMEL-16841: prevent an NPE when stopping camel-kubernetes config map (#5918)
56a9a22 is described below
commit 56a9a229fff0f5570fa5759e9930a04bf081cf2a
Author: Otavio Rodolfo Piske <or...@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();