You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/01/12 17:01:31 UTC

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

Author: ningjiang
Date: Mon Jan 12 08:01:25 2009
New Revision: 733825

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

........
  r732943 | davsclaus | 2009-01-09 15:50:59 +0800 (Fri, 09 Jan 2009) | 1 line
  
  Fixed failing unit 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/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 08:01:25 2009
@@ -1 +1 @@
-/activemq/camel/trunk:733749
+/activemq/camel/trunk:732943,733749

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=733825&r1=733824&r2=733825&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 Mon Jan 12 08:01:25 2009
@@ -112,6 +112,8 @@
         template.sendBodyAndHeader("direct:start", "Message 2b", "id", "2");
         template.sendBodyAndHeader("direct:start", "Message 1c", "id", "1");
 
+        // need a little sleep between batches
+        Thread.sleep(10);
         // when we sent the next message we have reached the in batch size limit and the current
         // aggregated exchanges will be sent
         template.sendBodyAndHeader("direct:start", "Message 3a", "id", "3");