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 2016/02/27 12:31:47 UTC
[2/2] camel git commit: Pass in used EM in the exchange when created
in the jpa consumer
Pass in used EM in the exchange when created in the jpa consumer
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c7d7d31c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c7d7d31c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c7d7d31c
Branch: refs/heads/camel-2.16.x
Commit: c7d7d31cce2e3480058f9cff781cb27f41a620cc
Parents: 0cf8e04
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Feb 27 12:30:20 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Feb 27 12:30:47 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/jpa/JpaConsumer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c7d7d31c/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
index 42b5ff0..1e295e2 100644
--- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
+++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
@@ -116,7 +116,7 @@ public class JpaConsumer extends ScheduledBatchPollingConsumer {
DataHolder holder = new DataHolder();
holder.manager = entityManager;
holder.result = result;
- holder.exchange = createExchange(result);
+ holder.exchange = createExchange(result, entityManager);
answer.add(holder);
}
@@ -502,10 +502,10 @@ public class JpaConsumer extends ScheduledBatchPollingConsumer {
}
}
- protected Exchange createExchange(Object result) {
+ protected Exchange createExchange(Object result, EntityManager entityManager) {
Exchange exchange = getEndpoint().createExchange();
exchange.getIn().setBody(result);
- exchange.getIn().setHeader(JpaConstants.ENTITYMANAGER, entityManager);
+ exchange.getIn().setHeader(JpaConstants.ENTITY_MANAGER, entityManager);
return exchange;
}