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 2016/04/01 13:49:04 UTC
[1/2] camel git commit: Fixed typo
Repository: camel
Updated Branches:
refs/heads/master 2019d67b3 -> 072933264
Fixed typo
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4ccf0759
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4ccf0759
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4ccf0759
Branch: refs/heads/master
Commit: 4ccf0759db92c62c8b54a3de18694f9f9f09f3f0
Parents: 2019d67
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 1 11:09:46 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 1 13:48:25 2016 +0200
----------------------------------------------------------------------
.../processor/aggregate/ShareUnitOfWorkAggregationStrategy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4ccf0759/camel-core/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
index 4a1187f..4523505 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
@@ -37,7 +37,7 @@ public final class ShareUnitOfWorkAggregationStrategy implements AggregationStra
}
public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
- // aggreagate using the actual strategy first
+ // aggregate using the actual strategy first
Exchange answer = strategy.aggregate(oldExchange, newExchange);
// ensure any errors is propagated from the new exchange to the answer
propagateFailure(answer, newExchange);
[2/2] camel git commit: CAMEL-8602: Java 8: ConcurrentLinkedHashMap
-> Caffeine. Fixed test
Posted by da...@apache.org.
CAMEL-8602: Java 8: ConcurrentLinkedHashMap -> Caffeine. Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/07293326
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/07293326
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/07293326
Branch: refs/heads/master
Commit: 072933264f6e7f0863bc702852282bb2a56fc3a3
Parents: 4ccf075
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 1 13:20:55 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 1 13:48:38 2016 +0200
----------------------------------------------------------------------
.../file/remote/FtpConsumerIdempotentMemoryRefTest.java | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/07293326/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentMemoryRefTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentMemoryRefTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentMemoryRefTest.java
index 8de66c9..704883e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentMemoryRefTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentMemoryRefTest.java
@@ -75,20 +75,13 @@ public class FtpConsumerIdempotentMemoryRefTest extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Hello A", "a.txt");
sendFile(getFtpUrl(), "Hello B", "b.txt");
// new files
- sendFile(getFtpUrl(), "Hello E", "f.txt");
- sendFile(getFtpUrl(), "Hello E", "g.txt");
+ sendFile(getFtpUrl(), "Hello F", "f.txt");
+ sendFile(getFtpUrl(), "Hello G", "g.txt");
assertMockEndpointsSatisfied();
assertTrue(notify.matches(5, TimeUnit.SECONDS));
assertEquals(5, repo.getCache().size());
- assertTrue(repo.contains("a.txt"));
- assertTrue(repo.contains("b.txt"));
- assertFalse(repo.contains("c.txt"));
- assertFalse(repo.contains("d.txt"));
- assertTrue(repo.contains("e.txt"));
- assertTrue(repo.contains("f.txt"));
- assertTrue(repo.contains("g.txt"));
}
@Override