Author: davsclaus
Date: Fri Jun 25 10:44:41 2010
New Revision: 957886
URL: http://svn.apache.org/viewvc?rev=957886&view=rev
Log:
Fixed test on other boxes
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregatorTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregatorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregatorTest.java?rev=957886&r1=957885&r2=957886&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregatorTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregatorTest.java
Fri Jun 25 10:44:41 2010
@@ -24,6 +24,7 @@ import static org.apache.camel.spring.pr
* @version $Revision$
*/
public class SpringAggregatorTest extends AggregatorTest {
+
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this,
"org/apache/camel/spring/processor/aggregator.xml");
}
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml?rev=957886&r1=957885&r2=957886&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
Fri Jun 25 10:44:41 2010
@@ -50,7 +50,7 @@
<route>
<from uri="direct:predicate"/>
- <aggregate strategyRef="myAggregatorStrategy"
eagerCheckCompletion="true">
+ <aggregate strategyRef="myAggregatorStrategy"
eagerCheckCompletion="true" completionTimeout="1000">
<correlationExpression>
<simple>header.cheese</simple>
</correlationExpression>
