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 2008/11/28 08:22:38 UTC
svn commit: r721361 - in /activemq/camel/branches/camel-1.x: ./
camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
Author: ningjiang
Date: Thu Nov 27 23:22:38 2008
New Revision: 721361
URL: http://svn.apache.org/viewvc?rev=721361&view=rev
Log:
Merged revisions 721360 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r721360 | ningjiang | 2008-11-28 15:18:07 +0800 (Fri, 28 Nov 2008) | 1 line
CAMEL-1125 Fixed the bug of MockEndpont.expectedMinimumMessageCount() doesn't work
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 27 23:22:38 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java?rev=721361&r1=721360&r2=721361&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java Thu Nov 27 23:22:38 2008
@@ -194,7 +194,7 @@
// -------------------------------------------------------------------------
/**
- * A stategy method to allow derived classes to deal with the newly created
+ * A strategy method to allow derived classes to deal with the newly created
* predicate in different ways
*/
protected Predicate<E> onNewPredicate(Predicate<E> predicate) {
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=721361&r1=721360&r2=721361&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java Thu Nov 27 23:22:38 2008
@@ -242,7 +242,7 @@
if (expectedMinimumCount >= 0) {
int receivedCounter = getReceivedCounter();
- assertTrue("Received message count " + receivedCounter + ", expected at least " + expectedCount, expectedCount <= receivedCounter);
+ assertTrue("Received message count " + receivedCounter + ", expected at least " + expectedMinimumCount, expectedMinimumCount <= receivedCounter);
}
for (Runnable test : tests) {