Author: bvahdat
Date: Mon Jan 21 17:35:18 2013
New Revision: 1436506
URL: http://svn.apache.org/viewvc?rev=1436506&view=rev
Log:
Merged revisions 1436505 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1436505 | bvahdat | 2013-01-21 18:33:47 +0100 (Mo, 21 Jan 2013) | 1 line
CAMEL-5983: Corrected the comment.
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1436505
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java?rev=1436506&r1=1436505&r2=1436506&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
Mon Jan 21 17:35:18 2013
@@ -50,10 +50,11 @@ public class ValidationTest extends Cont
try {
template.sendBodyAndHeader("direct:start", "<invalid/>", "foo",
"notMatchedHeaderValue");
} catch (RuntimeCamelException e) {
- // the expected empty catch block here is not intended for this
class itself but the drived
- // ones e.g. ValidationWithErrorInHandleAndFinallyBlockTest where
noErrorHandler() is being
- // installed. this's also why there's no fail("Should have thrown
an exception") call here
- // right after template.sendBodyAndHeader()
+ // the expected empty catch block here is not intended for this
class itself but the subclasses
+ // e.g. ValidationWithErrorInHandleAndFinallyBlockTest where
noErrorHandler() is being installed.
+ // this's also why there's no fail("Should have thrown an
exception") call here right after
+ // template.sendBodyAndHeader() call as RuntimeCamelException will
be not thrown by *all* subclasses
+ // but only by some of them.
}
assertMockEndpointsSatisfied();