You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/05/29 17:06:53 UTC
[2/4] camel git commit: CAMEL-8816 Fixed the elasticsearch component
start up issue when using the local elasticsearch instance
CAMEL-8816 Fixed the elasticsearch component start up issue when using the local elasticsearch instance
Conflicts:
components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/920429bd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/920429bd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/920429bd
Branch: refs/heads/camel-2.14.x
Commit: 920429bd7e705c5ff24bf97715d94cd4e775ccf3
Parents: f0443ae
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri May 29 11:15:18 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri May 29 22:35:19 2015 +0800
----------------------------------------------------------------------
.../component/elasticsearch/ElasticsearchEndpoint.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/920429bd/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
index 108ce01..584229b 100644
--- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
+++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
@@ -31,9 +31,12 @@ import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.InetSocketTransportAddress;
import org.elasticsearch.node.Node;
+import org.elasticsearch.node.NodeBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.elasticsearch.node.NodeBuilder.nodeBuilder;
+
/**
* Represents an Elasticsearch endpoint.
*/
@@ -89,7 +92,12 @@ public class ElasticsearchEndpoint extends DefaultEndpoint {
.addTransportAddress(new InetSocketTransportAddress(configuration.getIp(), configuration.getPort()));
this.client = client;
} else {
- node = configuration.buildNode();
+ NodeBuilder builder = nodeBuilder().local(configuration.isLocal()).data(configuration.isData());
+ if (!configuration.isLocal() && configuration.getClusterName() != null) {
+ builder.clusterName(configuration.getClusterName());
+ }
+ builder.getSettings().classLoader(Settings.class.getClassLoader());
+ node = builder.node();
client = node.client();
}
}