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 2015/04/04 16:06:05 UTC

[1/2] camel git commit: CAMEL-8597: fix setting of indexType message header

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x f207f207d -> c2e58a246
  refs/heads/master 4c261720d -> d0fb487b9


CAMEL-8597: fix setting of indexType message header


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d0fb487b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d0fb487b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d0fb487b

Branch: refs/heads/master
Commit: d0fb487b934e96378fed3bc3c0682f45a07338ff
Parents: 4c26172
Author: Jakub Kotowski <ja...@kotowski.cz>
Authored: Fri Apr 3 13:00:55 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Apr 4 16:07:19 2015 +0200

----------------------------------------------------------------------
 .../camel/component/elasticsearch/ElasticsearchProducer.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d0fb487b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
index b930119..2b432d5 100644
--- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
+++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
@@ -109,7 +109,7 @@ public class ElasticsearchProducer extends DefaultProducer {
         boolean configIndexType = false;
         String indexType = message.getHeader(ElasticsearchConfiguration.PARAM_INDEX_TYPE, String.class);
         if (indexType == null) {
-            message.setHeader(ElasticsearchConfiguration.PARAM_INDEX_TYPE, getEndpoint().getConfig().getIndexName());
+            message.setHeader(ElasticsearchConfiguration.PARAM_INDEX_TYPE, getEndpoint().getConfig().getIndexType());
             configIndexType = true;
         }
 


[2/2] camel git commit: CAMEL-8597: fix setting of indexType message header

Posted by da...@apache.org.
CAMEL-8597: fix setting of indexType message header


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c2e58a24
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c2e58a24
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c2e58a24

Branch: refs/heads/camel-2.15.x
Commit: c2e58a246bc625ba9ade1616aaa50d4020bf4364
Parents: f207f20
Author: Jakub Kotowski <ja...@kotowski.cz>
Authored: Fri Apr 3 13:00:55 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Apr 4 16:08:37 2015 +0200

----------------------------------------------------------------------
 .../camel/component/elasticsearch/ElasticsearchProducer.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c2e58a24/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
index c60a1df..c0952cf 100644
--- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
+++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
@@ -107,7 +107,7 @@ public class ElasticsearchProducer extends DefaultProducer {
         boolean configIndexType = false;
         String indexType = message.getHeader(ElasticsearchConfiguration.PARAM_INDEX_TYPE, String.class);
         if (indexType == null) {
-            message.setHeader(ElasticsearchConfiguration.PARAM_INDEX_TYPE, getEndpoint().getConfig().getIndexName());
+            message.setHeader(ElasticsearchConfiguration.PARAM_INDEX_TYPE, getEndpoint().getConfig().getIndexType());
             configIndexType = true;
         }