svn commit: r793603 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/component/mock/MockEndpoint.java test/java/org/apache/camel/processor/RoutePerformanceTest.java

[davsclaus]

Author: davsclaus
Date: Mon Jul 13 15:02:21 2009
New Revision: 793603

URL: http://svn.apache.org/viewvc?rev=793603&view=rev
Log:
removed option on mock endpoint at it caused harm

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=793603&r1=793602&r2=793603&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
 Mon Jul 13 15:02:21 2009
@@ -679,7 +679,7 @@
     }
 
     public int getReceivedCounter() {
-        return counter;
+        return receivedExchanges.size();
     }
 
     public List<Exchange> getReceivedExchanges() {
@@ -836,13 +836,13 @@
             }
         }
 
-        LOG.debug(getEndpointUri() + " >>>> " + (++counter) + " : " + exchange 
+ " with body: " + actualBody);
-
-        // only collect if needed
-        if (collectMaximumExchanges == -1 || counter < 
collectMaximumExchanges) {
-            receivedExchanges.add(exchange);
+        ++counter;
+        if (LOG.isDebugEnabled()) {
+            LOG.debug(getEndpointUri() + " >>>> " + (counter) + " : " + 
exchange + " with body: " + actualBody);
         }
 
+        receivedExchanges.add(exchange);
+
         Processor processor = processors.get(getReceivedCounter()) != null
                 ? processors.get(getReceivedCounter()) : defaultProcessor;
 

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java?rev=793603&r1=793602&r2=793603&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java
 Mon Jul 13 15:02:21 2009
@@ -33,8 +33,7 @@
 
     private int size = 10000;
     private SimpleDataSet dataSet = new SimpleDataSet(size);
-    // do not collect exchanges to go as fast as we can
-    private String uri = "mock:results?collectMaximumExchanges=0";
+    private String uri = "mock:results";
 
     public void testPerformance() throws Exception {
         if (!canRunOnThisPlatform()) {