Updated Branches: refs/heads/camel-2.12.x 4673d4306 -> 77266240b refs/heads/master a4c3f4438 -> 9cfd30962
CAMEL-7058: Fixed sql producer setting header after preserving. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9cfd3096 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9cfd3096 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9cfd3096 Branch: refs/heads/master Commit: 9cfd309625f2d83d9c9f85b6e1aa93e0ef3c7631 Parents: a4c3f44 Author: Claus Ibsen <[email protected]> Authored: Tue Dec 10 15:58:40 2013 +0100 Committer: Claus Ibsen <[email protected]> Committed: Tue Dec 10 15:58:40 2013 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/camel/component/sql/SqlProducer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9cfd3096/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java index 4b33c30..cf3b9ee 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java @@ -89,6 +89,9 @@ public class SqlProducer extends DefaultProducer { } else { boolean isResultSet = ps.execute(); if (isResultSet) { + // preserve headers first, so we can override the SQL_ROW_COUNT header + exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders()); + ResultSet rs = ps.getResultSet(); SqlOutputType outputType = getEndpoint().getOutputType(); log.trace("Got result list from query: {}, outputType={}", rs, outputType); @@ -115,9 +118,6 @@ public class SqlProducer extends DefaultProducer { } else { throw new IllegalArgumentException("Invalid outputType=" + outputType); } - - // preserve headers - exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders()); } else { exchange.getIn().setHeader(SqlConstants.SQL_UPDATE_COUNT, ps.getUpdateCount()); }
