Author: davsclaus
Date: Fri Sep 2 09:15:17 2011
New Revision: 1164423
URL: http://svn.apache.org/viewvc?rev=1164423&view=rev
Log:
Merged revisions 1159683 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEventNotifierTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 2 09:15:17 2011
@@ -1 +1 @@
-/camel/trunk:1150651,1151054,1152170,1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159457,1159460,1159606,1159682,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395
+/camel/trunk:1150651,1151054,1152170,1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEventNotifierTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEventNotifierTest.java?rev=1164423&r1=1164422&r2=1164423&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEventNotifierTest.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEventNotifierTest.java
Fri Sep 2 09:15:17 2011
@@ -36,7 +36,7 @@ public class AsyncEndpointEventNotifierT
private final CountDownLatch latch = new CountDownLatch(1);
private final AtomicLong time = new AtomicLong();
- public void testAsyncEndpointEventNotifer() throws Exception {
+ public void testAsyncEndpointEventNotifier() throws Exception {
getMockEndpoint("mock:before").expectedBodiesReceived("Hello Camel");
getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
@@ -48,7 +48,8 @@ public class AsyncEndpointEventNotifierT
assertTrue("Should count down", latch.await(10, TimeUnit.SECONDS));
long delta = time.get();
- assertTrue("Should take about 1000 millis sec, was: " + delta, delta >
800);
+ log.info("ExchangeEventSent took ms: " + delta);
+ assertTrue("Should take about 250 millis sec, was: " + delta, delta >
200);
}
@Override
@@ -93,7 +94,7 @@ public class AsyncEndpointEventNotifierT
from("direct:start")
.to("mock:before")
- .to("async:Bye Camel?delay=1000")
+ .to("async:Bye Camel?delay=250")
.to("mock:result");
}
};