Author: gertv
Date: Tue Nov 24 16:58:26 2009
New Revision: 883781
URL: http://svn.apache.org/viewvc?rev=883781&view=rev
Log:
Merged revisions 883713 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r883713 | gertv | 2009-11-24 15:54:55 +0100 (Tue, 24 Nov 2009) | 1 line
CAMEL-2221: Inconsistent out message when using dynamic recipient list
........
Added:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
- copied, changed from r883713,
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 24 16:58:26 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,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667
+/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,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713
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/MethodInfo.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=883781&r1=883780&r2=883781&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
Tue Nov 24 16:58:26 2009
@@ -92,6 +92,8 @@
Object result = invoke(method, pojo, arguments, exchange);
if (recipientList != null) {
recipientList.sendToRecipientList(exchange, result);
+ // we don't want to return the list of endpoints
+ return null;
}
return result;
}
Copied:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
(from r883713,
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java)
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java?p2=camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java&r1=883713&r2=883781&rev=883781&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
Tue Nov 24 16:58:26 2009
@@ -16,7 +16,7 @@
*/
package org.apache.camel.processor;
-import org.apache.camel.*;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -52,7 +52,7 @@
MockEndpoint b = getMockEndpoint("mock:b");
b.expectedBodiesReceived("Hello b");
- String out = template.requestBody(uri, "Hello " + uri, String.class);
+ Object out = template.requestBody(uri, "Hello " + uri);
assertEquals("Hello b", out);
assertMockEndpointsSatisfied();
@@ -64,7 +64,7 @@
getContext().addInterceptStrategy(new Tracer());
from("direct:beanRef").beanRef("myBean", "route");
- from("direct:recipientList").recipientList(bean("myBean",
"recipientList"));
+ from("direct:recipientList").recipientList().method("myBean",
"recipientList");
from("direct:a").transform(constant("Hello a")).to("mock:a");
from("direct:b").transform(constant("Hello b")).to("mock:b");
