Author: davsclaus Date: Mon Apr 20 07:29:59 2009 New Revision: 766603 URL: http://svn.apache.org/viewvc?rev=766603&view=rev Log: Merged revisions 766602 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk
........ r766602 | davsclaus | 2009-04-20 09:21:19 +0200 (Mon, 20 Apr 2009) | 1 line Fixed failing unit test on some servers reported by TC. ........ Modified: camel/branches/camel-1.x/ (props changed) camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteWithTracerTest.java Propchange: camel/branches/camel-1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 20 07:29:59 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 +/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 Propchange: camel/branches/camel-1.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteWithTracerTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteWithTracerTest.java?rev=766603&r1=766602&r2=766603&view=diff ============================================================================== --- camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteWithTracerTest.java (original) +++ camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteWithTracerTest.java Mon Apr 20 07:29:59 2009 @@ -30,7 +30,7 @@ return new RouteBuilder() { public void configure() { getContext().addInterceptStrategy(new Tracer()); - from("timer://foo?fixedRate=true&delay=0&period=500").to("bean:myBean"); + from("timer://foo?fixedRate=true&delay=0&period=500").to("bean:myBean", "mock:result"); } }; }