Repository: camel Updated Branches: refs/heads/master f4d9d3c33 -> 977f95860
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/977f9586 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/977f9586 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/977f9586 Branch: refs/heads/master Commit: 977f95860a5d2567980bb61766fbbb8f438e22e4 Parents: f4d9d3c Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Aug 12 16:44:23 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Aug 12 16:44:23 2014 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/component/jdbc/JdbcProducer.java | 2 ++ .../java/org/apache/camel/component/jdbc/ResultSetIterator.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/977f9586/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 c23a5f1..3de77e9 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 @@ -396,11 +396,13 @@ public class JdbcProducer extends DefaultProducer { @Override public void onComplete(Exchange exchange) { iterator.close(); + iterator.closeConnection(); } @Override public void onFailure(Exchange exchange) { iterator.close(); + iterator.closeConnection(); } } } http://git-wip-us.apache.org/repos/asf/camel/blob/977f9586/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/ResultSetIterator.java ---------------------------------------------------------------------- diff --git a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/ResultSetIterator.java b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/ResultSetIterator.java index 0c81a22..caf3ea8 100644 --- a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/ResultSetIterator.java +++ b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/ResultSetIterator.java @@ -106,10 +106,13 @@ public class ResultSetIterator implements Iterator<Map<String, Object>> { if (closed.compareAndSet(false, true)) { safeCloseResultSet(); safeCloseStatement(); - safeCloseConnection(); } } + public void closeConnection() { + safeCloseConnection(); + } + private void loadNext() throws SQLException { boolean hasNext = resultSet.next(); if (!hasNext) {
