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 2014/08/13 12:01:10 UTC
[1/3] git commit: CAMEL-7686: camel-jdbc - Fix this issue report
about retriving generated keys
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 7507c4928 -> da0df82df
refs/heads/camel-2.13.x 82a54b5fb -> 0007e1861
refs/heads/master 1e9878801 -> 6dc9d8a48
CAMEL-7686: camel-jdbc - Fix this issue report about retriving generated keys
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6dc9d8a4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6dc9d8a4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6dc9d8a4
Branch: refs/heads/master
Commit: 6dc9d8a48c7fba85e5158b89b8394eb565dc1331
Parents: 1e98788
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Aug 13 12:00:33 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Aug 13 12:00:33 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/jdbc/JdbcProducer.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6dc9d8a4/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
index 3de77e9..d78e9c7 100644
--- a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
+++ b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
@@ -222,6 +222,9 @@ public class JdbcProducer extends DefaultProducer {
shouldCloseResources = setResultSet(exchange, rs);
} else {
int updateCount = stmt.getUpdateCount();
+ // preserve headers
+ exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
+ // and then set the new header
exchange.getOut().setHeader(JdbcConstants.JDBC_UPDATE_COUNT, updateCount);
}
[2/3] git commit: CAMEL-7686: camel-jdbc - Fix this issue report
about retriving generated keys
Posted by da...@apache.org.
CAMEL-7686: camel-jdbc - Fix this issue report about retriving generated keys
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0007e186
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0007e186
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0007e186
Branch: refs/heads/camel-2.13.x
Commit: 0007e18611664fdbf9995f21e142f032388617ae
Parents: 82a54b5
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Aug 13 12:00:33 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Aug 13 12:00:51 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/jdbc/JdbcProducer.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0007e186/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
index 0446fb7..731fe51 100644
--- a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
+++ b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
@@ -189,6 +189,9 @@ public class JdbcProducer extends DefaultProducer {
setResultSet(exchange, rs);
} else {
int updateCount = stmt.getUpdateCount();
+ // preserve headers
+ exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
+ // and then set the new header
exchange.getOut().setHeader(JdbcConstants.JDBC_UPDATE_COUNT, updateCount);
}
[3/3] git commit: CAMEL-7686: camel-jdbc - Fix this issue report
about retriving generated keys
Posted by da...@apache.org.
CAMEL-7686: camel-jdbc - Fix this issue report about retriving generated keys
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/da0df82d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/da0df82d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/da0df82d
Branch: refs/heads/camel-2.12.x
Commit: da0df82dffd32a453419e628b78dc8166734dda3
Parents: 7507c49
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Aug 13 12:00:33 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Aug 13 12:00:58 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/jdbc/JdbcProducer.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/da0df82d/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
index 0446fb7..731fe51 100644
--- a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
+++ b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
@@ -189,6 +189,9 @@ public class JdbcProducer extends DefaultProducer {
setResultSet(exchange, rs);
} else {
int updateCount = stmt.getUpdateCount();
+ // preserve headers
+ exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
+ // and then set the new header
exchange.getOut().setHeader(JdbcConstants.JDBC_UPDATE_COUNT, updateCount);
}