Author: bvahdat Date: Mon Dec 10 20:59:58 2012 New Revision: 1419763 URL: http://svn.apache.org/viewvc?rev=1419763&view=rev Log: Merged revisions 1419760 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1419760 | bvahdat | 2012-12-10 21:58:05 +0100 (Mo, 10 Dez 2012) | 9 lines Merged revisions 1419757 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1419757 | bvahdat | 2012-12-10 21:56:02 +0100 (Mo, 10 Dez 2012) | 1 line CAMEL-5856: Added comment about the occasional 6 instead of 7 expected messages. ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1419757 Merged /camel/branches/camel-2.10.x:r1419760 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java?rev=1419763&r1=1419762&r2=1419763&view=diff ============================================================================== --- camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java (original) +++ camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java Mon Dec 10 20:59:58 2012 @@ -122,6 +122,7 @@ public class FromJmsToJdbcIdempotentCons // use a notify to know that after 1+6 (1 original + 6 redelivery) attempts from AcitveMQ NotifyBuilder notify = new NotifyBuilder(context).whenDone(7).create(); + // TODO: occasionally we get only 6 instead of 7 expected exchanges which's most probably an issue in ActiveMQ itself getMockEndpoint("mock:a").expectedMessageCount(7); getMockEndpoint("mock:b").expectedMessageCount(7); // force exception to occur at mock b
