Author: ningjiang Date: Wed Dec 12 14:19:09 2012 New Revision: 1420695 URL: http://svn.apache.org/viewvc?rev=1420695&view=rev Log: CAMEL-5860 fixed the validator component NPE Merged revisions 1420527 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1420527 | ningjiang | 2012-12-12 13:13:47 +0800 (Wed, 12 Dec 2012) | 10 lines Merged revisions 1420524 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1420524 | ningjiang | 2012-12-12 12:44:43 +0800 (Wed, 12 Dec 2012) | 1 line CAMEL-5860 fixed the validator component NPE ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1420524 Merged /camel/branches/camel-2.10.x:r1420527 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java?rev=1420695&r1=1420694&r2=1420695&view=diff ============================================================================== --- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java (original) +++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java Wed Dec 12 14:19:09 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/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java?rev=1420695&r1=1420694&r2=1420695&view=diff ============================================================================== --- camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java (original) +++ camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java Wed Dec 12 14:19:09 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 {
