You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/12/12 05:43:57 UTC

svn commit: r1420523 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/builder/xml/XsltBuilder.java test/java/org/apache/camel/component/xslt/XsltRouteTest.java

Author: ningjiang
Date: Wed Dec 12 04:43:56 2012
New Revision: 1420523

URL: http://svn.apache.org/viewvc?rev=1420523&view=rev
Log:
CAMEL-5864 fixed the camel-xslt component NPE when the message body is byte[]

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=1420523&r1=1420522&r2=1420523&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java Wed Dec 12 04:43:56 2012
@@ -458,7 +458,7 @@ public class XsltBuilder implements Proc
         if (body != null) {
             TypeConverter tc = exchange.getContext().getTypeConverterRegistry().lookup(Source.class, body.getClass());
             if (tc != null) {
-                source = tc.convertTo(Source.class, body);
+                source = tc.convertTo(Source.class, exchange, body);
             }
         }
 

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java?rev=1420523&r1=1420522&r2=1420523&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java Wed Dec 12 04:43:56 2012
@@ -24,17 +24,20 @@ import org.apache.camel.builder.RouteBui
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 
-/**
- *
- */
 public class XsltRouteTest extends ContextTestSupport {
+    public void testSendStringMessage() throws Exception {
+        sendMessageAndHaveItTransformed("<mail><subject>Hey</subject><body>Hello world!</body></mail>");
+    }
+    
+    public void testSendBytesMessage() throws Exception {
+        sendMessageAndHaveItTransformed("<mail><subject>Hey</subject><body>Hello world!</body></mail>".getBytes());
+    }
 
-    public void testSendMessageAndHaveItTransformed() throws Exception {
+    private void sendMessageAndHaveItTransformed(Object body) throws Exception {
         MockEndpoint endpoint = getMockEndpoint("mock:result");
         endpoint.expectedMessageCount(1);
 
-        template.sendBody("direct:start",
-                "<mail><subject>Hey</subject><body>Hello world!</body></mail>");
+        template.sendBody("direct:start", body);
 
         assertMockEndpointsSatisfied();