Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x fb5619cfc -> 440531751


[CAMEL-9026] ClassNotFoundException: kafka.serializer.StringEncoder

Conflicts:
        
components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/44053175
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/44053175
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/44053175

Branch: refs/heads/camel-2.15.x
Commit: 440531751d887bbbcaaa59a153bc9f4e768b189a
Parents: fb5619c
Author: Thomas Diesler <[email protected]>
Authored: Mon Jul 27 17:21:11 2015 +0200
Committer: Andrea Cosentino <[email protected]>
Committed: Wed Jul 29 20:44:44 2015 +0200

----------------------------------------------------------------------
 .../camel/component/kafka/KafkaEndpoint.java    | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/44053175/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
----------------------------------------------------------------------
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
index 8dde7c1..1652d78 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
@@ -20,6 +20,7 @@ import java.net.URISyntaxException;
 import java.util.concurrent.ExecutorService;
 
 import kafka.message.MessageAndMetadata;
+
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -42,6 +43,9 @@ public class KafkaEndpoint extends DefaultEndpoint implements 
MultipleConsumersS
     @UriParam
     private KafkaConfiguration configuration = new KafkaConfiguration();
 
+    @UriParam(description = "If the option is true, then KafkaProducer will 
ignore the KafkaConstants.TOPIC header setting of the inbound message.", 
defaultValue = "false")
+    private boolean bridgeEndpoint;
+
     public KafkaEndpoint() {
     }
 
@@ -85,8 +89,20 @@ public class KafkaEndpoint extends DefaultEndpoint 
implements MultipleConsumersS
             keyClassName = msgClassName;
         }
 
-        Class k = 
getCamelContext().getClassResolver().resolveMandatoryClass(keyClassName);
-        Class v = 
getCamelContext().getClassResolver().resolveMandatoryClass(msgClassName);
+        ClassLoader cl = getClass().getClassLoader();
+
+        Class<?> k;
+        try {
+            k = cl.loadClass(keyClassName);
+        } catch (ClassNotFoundException x) {
+            k = 
getCamelContext().getClassResolver().resolveMandatoryClass(keyClassName);
+        }
+        Class<?> v;
+        try {
+            v = cl.loadClass(msgClassName);
+        } catch (ClassNotFoundException x) {
+            v = 
getCamelContext().getClassResolver().resolveMandatoryClass(msgClassName);
+        }
         return createProducer(k, v, this);
     }
 

Reply via email to