Repository: camel Updated Branches: refs/heads/master dc6fdeeaf -> 16cac67c1
CAMEL-11674 - Couchbase client is never shut down Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/16cac67c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/16cac67c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/16cac67c Branch: refs/heads/master Commit: 16cac67c1f9d9e7b211d92b674115ab82400bf7c Parents: dc6fdee Author: Andrea Cosentino <anco...@gmail.com> Authored: Mon Aug 21 10:33:07 2017 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Mon Aug 21 10:33:07 2017 +0200 ---------------------------------------------------------------------- .../apache/camel/component/couchbase/CouchbaseConsumer.java | 3 +++ .../apache/camel/component/couchbase/CouchbaseProducer.java | 8 ++++++++ 2 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/16cac67c/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java index e9b307e..f970267 100644 --- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java +++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java @@ -84,6 +84,9 @@ public class CouchbaseConsumer extends DefaultScheduledPollConsumer { protected void doStop() throws Exception { log.info("Stopping Couchbase consumer"); super.doStop(); + if (client != null) { + client.shutdown(); + } } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/16cac67c/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java index bccc244..e407fc5 100644 --- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java +++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java @@ -133,6 +133,14 @@ public class CouchbaseProducer extends DefaultProducer { exchange.getIn().removeHeader(HEADER_ID); } + + @Override + protected void doStop() throws Exception { + super.doStop(); + if (client != null) { + client.shutdown(); + } + } private Boolean setDocument(String id, int expiry, Object obj, PersistTo persistTo, ReplicateTo replicateTo) throws Exception { return setDocument(id, expiry, obj, producerRetryAttempts, persistTo, replicateTo);
