You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2008/12/18 19:45:48 UTC

svn commit: r727787 - in /activemq/camel/branches/camel-1.x: ./ camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java

Author: janstey
Date: Thu Dec 18 10:45:47 2008
New Revision: 727787

URL: http://svn.apache.org/viewvc?rev=727787&view=rev
Log:
Merged revisions 727786 via svnmerge from 
https://svn.apache.org/repos/asf/activemq/camel/trunk

........
  r727786 | janstey | 2008-12-18 15:10:51 -0330 (Thu, 18 Dec 2008) | 1 line
  
  Fix timing issue in aggregator test
........

Modified:
    activemq/camel/branches/camel-1.x/   (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java?rev=727787&r1=727786&r2=727787&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java Thu Dec 18 10:45:47 2008
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.processor.aggregator;
 
+import java.util.concurrent.TimeUnit;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -111,6 +113,9 @@
         template.sendBodyAndHeader("direct:start", "Message 1b", "id", "1");
         template.sendBodyAndHeader("direct:start", "Message 2b", "id", "2");
         template.sendBodyAndHeader("direct:start", "Message 1c", "id", "1");
+
+        result.await(500L, TimeUnit.MILLISECONDS);
+        
         // when we sent the next message we have reached the in batch size limit and the current
         // aggregated exchanges will be sent
         // wait a while for aggregating in a slower box