Author: davsclaus
Date: Mon Mar 30 16:30:50 2009
New Revision: 760031
URL: http://svn.apache.org/viewvc?rev=760031&view=rev
Log:
Merged revisions 760003 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r760003 | davsclaus | 2009-03-30 17:19:03 +0200 (Mon, 30 Mar 2009) | 1 line
CAMEL-1502: Bean component should propagate headers.
........
Added:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java
- copied, changed from r760003,
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/SetExchangePatternTest.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 30 16:30:50 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=760031&r1=760030&r2=760031&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
Mon Mar 30 16:30:50 2009
@@ -123,6 +123,8 @@
LOG.debug("Setting bean invocation result on the OUT
message: " + value);
}
exchange.getOut(true).setBody(value);
+ // propagate headers
+
exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
} else {
// if not out then set it on the in
if (LOG.isDebugEnabled()) {
Copied:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java
(from r760003,
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java)
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java?p2=camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java&r1=760003&r2=760031&rev=760031&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java
Mon Mar 30 16:30:50 2009
@@ -31,7 +31,7 @@
mock.expectedBodiesReceived("Order OK for id: 123");
mock.expectedHeaderReceived("foo", "bar");
- String out = template.requestBody("direct:start", "123", String.class);
+ String out = (String) template.requestBody("direct:start", "123");
assertEquals("OK", out);
assertMockEndpointsSatisfied();
Modified:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/SetExchangePatternTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/SetExchangePatternTest.java?rev=760031&r1=760030&r2=760031&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/SetExchangePatternTest.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/SetExchangePatternTest.java
Mon Mar 30 16:30:50 2009
@@ -73,7 +73,9 @@
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
String expectedBody = "InOnlyMessage";
resultEndpoint.expectedBodiesReceived(expectedBody);
- template.sendBody(sendUri, sendPattern, expectedBody);
+ resultEndpoint.expectedHeaderReceived("foo", "bar");
+
+ template.sendBodyAndHeader(sendUri, sendPattern, expectedBody, "foo",
"bar");
resultEndpoint.assertIsSatisfied();
ExchangePattern actualPattern =
resultEndpoint.getExchanges().get(0).getPattern();
assertEquals("received exchange pattern", actualPattern,
expectedPattern);
