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/29 12:33:58 UTC
[6/6] git commit: Polished
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e262b41
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e262b41
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e262b41
Branch: refs/heads/camel-2.11.x
Commit: 3e262b41fe9766c0e69ccc2019d9d98727b60f35
Parents: d417164
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Sep 29 12:17:36 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Sep 29 12:33:45 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/3e262b41/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/3e262b41/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 46ef290..c490008 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
@@ -483,7 +483,7 @@ public class AggregateProcessor extends ServiceSupport implements Processor, Nav
((CompletionAwareAggregationStrategy) aggregationStrategy).onCompletion(exchange);
}
- // send this exchange
+ // send this exchange
executorService.submit(new Runnable() {
public void run() {
LOG.debug("Processing aggregated exchange: {}", exchange);