Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9f5b9980 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9f5b9980 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9f5b9980 Branch: refs/heads/master Commit: 9f5b99802484661177e22c80a06ea7f228a88a1d Parents: 3e58b69 Author: Claus Ibsen <[email protected]> Authored: Sun Sep 29 12:17:36 2013 +0200 Committer: Claus Ibsen <[email protected]> Committed: Sun Sep 29 12:17:36 2013 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/impl/JndiRegistry.java | 8 +++++--- .../apache/camel/processor/aggregate/AggregateProcessor.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9f5b9980/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java index 5a63e48..173587d 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java +++ b/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java @@ -117,16 +117,18 @@ public class JndiRegistry implements Registry { return findByTypeWithName(type); } - public void bind(String s, Object o) { + public void bind(String name, Object object) { try { - getContext().bind(s, o); + getContext().bind(name, object); } catch (NamingException e) { throw new RuntimeCamelException(e); } } public void close() throws NamingException { - getContext().close(); + if (context != null) { + context.close(); + } } public Context getContext() throws NamingException { http://git-wip-us.apache.org/repos/asf/camel/blob/9f5b9980/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java index 1f0336c..8fe24c5 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java @@ -532,7 +532,7 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor ((CompletionAwareAggregationStrategy) aggregationStrategy).onCompletion(exchange); } - // send this exchange + // send this exchange executorService.submit(new Runnable() { public void run() { LOG.debug("Processing aggregated exchange: {}", exchange);
