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/05/10 20:42:43 UTC
[2/3] camel git commit: CAMEL-8765: JpaConsumer - May poll too soon
before JPA stuff is initialized.
CAMEL-8765: JpaConsumer - May poll too soon before JPA stuff is initialized.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/32001471
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/32001471
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/32001471
Branch: refs/heads/camel-2.15.x
Commit: 320014713b55c3532496e615c24d05b14d5873f4
Parents: 994d0a4
Author: Claus Ibsen <da...@apache.org>
Authored: Sun May 10 20:46:13 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun May 10 20:46:13 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/jpa/JpaConsumer.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/32001471/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 9824f7d..850b922 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
@@ -499,9 +499,11 @@ public class JpaConsumer extends ScheduledBatchPollingConsumer {
@Override
protected void doStart() throws Exception {
- super.doStart();
+ // need to setup entity manager first
this.entityManager = entityManagerFactory.createEntityManager();
LOG.trace("Created EntityManager {} on {}", entityManager, this);
+
+ super.doStart();
}
@Override
@@ -511,8 +513,9 @@ public class JpaConsumer extends ScheduledBatchPollingConsumer {
@Override
protected void doShutdown() throws Exception {
- super.doShutdown();
this.entityManager.close();
LOG.trace("Closed EntityManager {} on {}", entityManager, this);
+
+ super.doShutdown();
}
}