You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/09/24 09:52:27 UTC
git commit: CAMEL-6775: Optimized aggergate eip to send out
aggregated exchange outside lock.
Updated Branches:
refs/heads/master ca90341e9 -> 1ce21f422
CAMEL-6775: Optimized aggergate eip to send out aggregated exchange outside lock.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1ce21f42
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1ce21f42
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1ce21f42
Branch: refs/heads/master
Commit: 1ce21f422be5d9072efbe3016e3c039ac2b93b5f
Parents: ca90341
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Sep 24 09:52:14 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Sep 24 09:52:14 2013 +0200
----------------------------------------------------------------------
.../apache/camel/processor/aggregator/AggregatorLockingTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1ce21f42/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorLockingTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorLockingTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorLockingTest.java
index d988c9b..2bb64b2 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorLockingTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorLockingTest.java
@@ -60,7 +60,9 @@ public class AggregatorLockingTest extends ContextTestSupport {
public void process(Exchange exchange) throws Exception {
latch.countDown();
// block until the other thread counts down as well
- latch.await(5, TimeUnit.SECONDS);
+ if(!latch.await(5, TimeUnit.SECONDS)) {
+ throw new RuntimeException("Took too long; assume threads are blocked and fail test");
+ }
}
})
.log("After await with thread: ${threadName} and body: ${body}")