Repository: camel Updated Branches: refs/heads/camel-2.17.x cf939a692 -> 2450bcad5
Fixed CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2450bcad Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2450bcad Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2450bcad Branch: refs/heads/camel-2.17.x Commit: 2450bcad58d44b1e083447a1e8eb4c2248aa6cc0 Parents: cf939a6 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Jun 12 17:27:38 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Jun 12 17:27:38 2016 +0200 ---------------------------------------------------------------------- .../org/apache/camel/component/dozer/DozerEndpoint.java | 5 +++-- .../elasticsearch/ElasticsearchConfiguration.java | 12 ++++++------ .../java/org/apache/camel/karaf/commands/RestShow.java | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2450bcad/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java index 190d1cc..92774b7 100644 --- a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java +++ b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java @@ -167,10 +167,11 @@ public class DozerEndpoint extends DefaultEndpoint { BeanContainer.getInstance().setElementReader(reader); } finally { Thread.currentThread().setContextClassLoader(tccl); - if (elprop != null) + if (elprop != null) { System.setProperty("javax.el.ExpressionFactory", elprop); - else + } else { System.clearProperty("javax.el.ExpressionFactory"); + } } } http://git-wip-us.apache.org/repos/asf/camel/blob/2450bcad/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java index 6aef4f8..c3bd9e5 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java @@ -184,11 +184,11 @@ public class ElasticsearchConfiguration { /** * The path.home property of ElasticSearch configuration. You need to provide a valid path, otherwise the default, /usr/share/elasticsearch, will be used. */ - public String getPathHome() { - return pathHome; - } + public String getPathHome() { + return pathHome; + } - public void setPathHome(String pathHome) { - this.pathHome = pathHome; - } + public void setPathHome(String pathHome) { + this.pathHome = pathHome; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/2450bcad/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestShow.java ---------------------------------------------------------------------- diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestShow.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestShow.java index eea0911..55422c4 100644 --- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestShow.java +++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestShow.java @@ -25,7 +25,7 @@ public class RestShow extends CamelCommandSupport { @Argument(index = 0, name = "name", description = "The name of the Camel context", required = true, multiValued = false) String name; - + public Object doExecute() throws Exception { RestShowCommand command = new RestShowCommand(name); return command.execute(camelController, System.out, System.err);
