Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9FE29200BF8 for ; Fri, 13 Jan 2017 11:04:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 9E676160B3F; Fri, 13 Jan 2017 10:04:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EA5F7160B32 for ; Fri, 13 Jan 2017 11:04:18 +0100 (CET) Received: (qmail 18171 invoked by uid 500); 13 Jan 2017 10:04:18 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 18162 invoked by uid 99); 13 Jan 2017 10:04:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jan 2017 10:04:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E5F2ADFA9D; Fri, 13 Jan 2017 10:04:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: acosentino@apache.org To: commits@camel.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: camel git commit: CAMEL-10701 - Use proper classloader for loading authentication settings in Kafka Date: Fri, 13 Jan 2017 10:04:17 +0000 (UTC) archived-at: Fri, 13 Jan 2017 10:04:19 -0000 Repository: camel Updated Branches: refs/heads/master 238287023 -> 83c3e86d5 CAMEL-10701 - Use proper classloader for loading authentication settings in Kafka Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/83c3e86d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/83c3e86d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/83c3e86d Branch: refs/heads/master Commit: 83c3e86d5db7f6429fb5e7f262c8f23dd4ddaf25 Parents: 2382870 Author: Antoine DESSAIGNE Authored: Fri Jan 13 10:33:25 2017 +0100 Committer: Andrea Cosentino Committed: Fri Jan 13 11:03:56 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/component/kafka/KafkaConsumer.java | 4 ++-- .../java/org/apache/camel/component/kafka/KafkaProducer.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/83c3e86d/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 4362390..549c1c2 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 @@ -119,8 +119,8 @@ 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); + // Kafka uses reflection for loading authentication settings, use its classloader + Thread.currentThread().setContextClassLoader(org.apache.kafka.clients.consumer.KafkaConsumer.class.getClassLoader()); this.consumer = new org.apache.kafka.clients.consumer.KafkaConsumer(kafkaProps); } finally { Thread.currentThread().setContextClassLoader(threadClassLoader); http://git-wip-us.apache.org/repos/asf/camel/blob/83c3e86d/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 1a3ae93..2ffe96b 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 @@ -83,8 +83,8 @@ 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); + // Kafka uses reflection for loading authentication settings, use its classloader + Thread.currentThread().setContextClassLoader(org.apache.kafka.clients.producer.KafkaProducer.class.getClassLoader()); kafkaProducer = new org.apache.kafka.clients.producer.KafkaProducer(props); } finally { Thread.currentThread().setContextClassLoader(threadClassLoader);