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 2016/07/01 06:58:50 UTC
[1/2] camel git commit: Fix for kafka partitioner static initializer
in OSGI env
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x fc7fad5a7 -> ef0d58271
Fix for kafka partitioner static initializer in OSGI env
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/423f1384
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/423f1384
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/423f1384
Branch: refs/heads/camel-2.17.x
Commit: 423f138483a1022cce656965265cdfd79a868c3d
Parents: fc7fad5
Author: John Moon <jo...@transamerica.com>
Authored: Wed Jun 29 14:44:55 2016 -0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jul 1 08:58:31 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/kafka/KafkaProducer.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/423f1384/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index b1a496c..6170151 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -80,7 +80,13 @@ public class KafkaProducer extends DefaultAsyncProducer {
protected void doStart() throws Exception {
Properties props = getProps();
if (kafkaProducer == null) {
- kafkaProducer = new org.apache.kafka.clients.producer.KafkaProducer(props);
+ ClassLoader threadClassLoader = Thread.currentThread().getContextClassLoader();
+ try {
+ Thread.currentThread().setContextClassLoader(null);
+ kafkaProducer = new org.apache.kafka.clients.producer.KafkaProducer(props);
+ } finally {
+ Thread.currentThread().setContextClassLoader(threadClassLoader);
+ }
}
// if we are in asynchronous mode we need a worker pool
[2/2] camel git commit: added comment for OSGI fix
Posted by da...@apache.org.
added comment for OSGI fix
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ef0d5827
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ef0d5827
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ef0d5827
Branch: refs/heads/camel-2.17.x
Commit: ef0d5827175a822b3b52c2c3ccdf8c529f4b6c7b
Parents: 423f138
Author: John Moon <jo...@transamerica.com>
Authored: Thu Jun 30 09:01:57 2016 -0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jul 1 08:58:38 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/kafka/KafkaConsumer.java | 1 +
.../main/java/org/apache/camel/component/kafka/KafkaProducer.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ef0d5827/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index daae07a..7fdf8ac 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -98,6 +98,7 @@ public class KafkaConsumer extends DefaultConsumer {
ClassLoader threadClassLoader = Thread.currentThread().getContextClassLoader();
try {
+ //Fix for running camel-kafka in OSGI see KAFKA-3218
Thread.currentThread().setContextClassLoader(null);
this.consumer = new org.apache.kafka.clients.consumer.KafkaConsumer(kafkaProps);
} finally {
http://git-wip-us.apache.org/repos/asf/camel/blob/ef0d5827/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index 6170151..af41a24 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -82,6 +82,7 @@ public class KafkaProducer extends DefaultAsyncProducer {
if (kafkaProducer == null) {
ClassLoader threadClassLoader = Thread.currentThread().getContextClassLoader();
try {
+ //Fix for running camel-kafka in OSGI see KAFKA-3218
Thread.currentThread().setContextClassLoader(null);
kafkaProducer = new org.apache.kafka.clients.producer.KafkaProducer(props);
} finally {