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:44:44 UTC
svn commit: r1420524 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
test/java/org/apache/camel/component/validator/ValidatorRouteTest.java
Author: ningjiang
Date: Wed Dec 12 04:44:43 2012
New Revision: 1420524
URL: http://svn.apache.org/viewvc?rev=1420524&view=rev
Log:
CAMEL-5860 fixed the validator component NPE
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java?rev=1420524&r1=1420523&r2=1420524&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java Wed Dec 12 04:44:43 2012
@@ -340,7 +340,7 @@ public class ValidatingProcessor impleme
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/validator/ValidatorRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java?rev=1420524&r1=1420523&r2=1420524&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java Wed Dec 12 04:44:43 2012
@@ -49,6 +49,16 @@ public class ValidatorRouteTest extends
MockEndpoint.assertIsSatisfied(validEndpoint, invalidEndpoint, finallyEndpoint);
}
+
+ public void testInvalideBytesMessage() throws Exception {
+ invalidEndpoint.expectedMessageCount(1);
+ finallyEndpoint.expectedMessageCount(1);
+
+ template.sendBody("direct:start",
+ "<mail xmlns='http://foo.com/bar'><body>Hello world!</body></mail>".getBytes());
+
+ MockEndpoint.assertIsSatisfied(validEndpoint, invalidEndpoint, finallyEndpoint);
+ }
@Override
protected void setUp() throws Exception {