camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r775584 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/ camel-core/src/main/java/org/apache/camel/model/ camel-core/src/test/java/org/apache/camel/processor/async/ components/camel-spring/src/test/resources/org/apache/camel/sp...
Date Sun, 17 May 2009 06:45:58 GMT
Author: ningjiang
Date: Sun May 17 06:45:57 2009
New Revision: 775584

URL: http://svn.apache.org/viewvc?rev=775584&view=rev
Log:
Fixed the async test error on a slower box

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeExchangeException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWaitIfReplyExpectedTest.java
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWaitIfReplyExpectedTest.xml

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeExchangeException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeExchangeException.java?rev=775584&r1=775583&r2=775584&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeExchangeException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/RuntimeExchangeException.java Sun
May 17 06:45:57 2009
@@ -23,7 +23,7 @@
  */
 public class RuntimeExchangeException extends RuntimeCamelException {
     private static final long serialVersionUID = -8721487431101572630L;
-    private transient final Exchange exchange;
+    private final transient Exchange exchange;
 
     public RuntimeExchangeException(String message, Exchange exchange) {
         super(createMessage(message, exchange));

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=775584&r1=775583&r2=775584&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java Sun
May 17 06:45:57 2009
@@ -49,9 +49,9 @@
 import org.apache.camel.processor.DefaultChannel;
 import org.apache.camel.processor.InterceptEndpointProcessor;
 import org.apache.camel.processor.Pipeline;
-import org.apache.camel.processor.loadbalancer.LoadBalancer;
 import org.apache.camel.processor.aggregate.AggregationCollection;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
+import org.apache.camel.processor.loadbalancer.LoadBalancer;
 import org.apache.camel.spi.DataFormat;
 import org.apache.camel.spi.IdempotentRepository;
 import org.apache.camel.spi.InterceptStrategy;
@@ -60,6 +60,7 @@
 import org.apache.camel.spi.TransactedPolicy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import static org.apache.camel.builder.Builder.body;
 
 /**

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteTest.java?rev=775584&r1=775583&r2=775584&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteTest.java
Sun May 17 06:45:57 2009
@@ -138,7 +138,7 @@
                             // from this point forward this is the async route doing its
work
                             // so we do a bit of delay to simulate heavy work that takes
time
                         .to("mock:foo")
-                        .delay(100)
+                        .delay(500)
                             // and we also work with the message so we can prepare a response
                         .process(new MyProcessor())
                             // and we use mocks for unit testing

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWaitIfReplyExpectedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWaitIfReplyExpectedTest.java?rev=775584&r1=775583&r2=775584&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWaitIfReplyExpectedTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWaitIfReplyExpectedTest.java
Sun May 17 06:45:57 2009
@@ -77,14 +77,15 @@
                         .transform(body().append(" World"))
                             // now turn the route into async from this point forward
                             // the caller will have a Future<Exchange> returned as
response in OUT
-                            // to be used to grap the async response when he fell like it
-                            // we only want to wait for tasks to compelte if we expect a
reply
+                            // to be used to grape the async response when he fell like it
+                            // we only want to wait for tasks to complete if we expect a
reply
                             // otherwise not
                         .async().waitForTaskToComplete(WaitForTaskToComplete.IfReplyExpected)
                             // from this point forward this is the async route doing its
work
                             // so we do a bit of delay to simulate heavy work that takes
time
                         .to("mock:foo")
-                        .delay(100)
+                            // wait a litter longer for the slow box
+                        .delay(500)
                             // and we also work with the message so we can prepare a response
                         .process(new MyProcessor())
                             // and we use mocks for unit testing

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteTest.xml?rev=775584&r1=775583&r2=775584&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteTest.xml
(original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteTest.xml
Sun May 17 06:45:57 2009
@@ -33,7 +33,7 @@
             <async>
                 <to uri="mock:foo"/>
                 <delay>
-                    <constant>100</constant>
+                    <constant>500</constant>
                 </delay>
                 <process ref="myProcessor"/>
                 <to uri="mock:result"/>

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWaitIfReplyExpectedTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWaitIfReplyExpectedTest.xml?rev=775584&r1=775583&r2=775584&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWaitIfReplyExpectedTest.xml
(original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWaitIfReplyExpectedTest.xml
Sun May 17 06:45:57 2009
@@ -33,7 +33,7 @@
             <async waitForTaskToComplete="IfReplyExpected">
                 <to uri="mock:foo"/>
                 <delay>
-                    <constant>100</constant>
+                    <constant>500</constant>
                 </delay>
                 <process ref="myProcessor"/>
                 <to uri="mock:result"/>



Mime
View raw message