Repository: camel Updated Branches: refs/heads/camel-2.14.x c1bdc2433 -> e137f17ea refs/heads/camel-2.15.x 994d0a4f7 -> 320014713 refs/heads/master 0fbc9cdfc -> 8d6a94ea0
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/8d6a94ea Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8d6a94ea Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8d6a94ea Branch: refs/heads/master Commit: 8d6a94ea089beb5f2a753b173c868ff23da85d42 Parents: 0fbc9cd Author: Claus Ibsen <davscl...@apache.org> Authored: Sun May 10 20:44:15 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun May 10 20:44:15 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/component/jpa/JpaConsumer.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8d6a94ea/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 2bc82a2..bfa861b 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 @@ -301,8 +301,6 @@ public class JpaConsumer extends ScheduledBatchPollingConsumer { * Sets whether to use NOWAIT on lock and silently skip the entity. This * allows different instances to process entities at the same time but not * processing the same entity. - * - * @param skipLockedEntity */ public void setSkipLockedEntity(boolean skipLockedEntity) { this.skipLockedEntity = skipLockedEntity; @@ -501,14 +499,15 @@ public class JpaConsumer extends ScheduledBatchPollingConsumer { @Override protected void doStart() throws Exception { - super.doStart(); - + // need to setup entity manager first if (getEndpoint().isSharedEntityManager()) { this.entityManager = SharedEntityManagerCreator.createSharedEntityManager(entityManagerFactory); } else { this.entityManager = entityManagerFactory.createEntityManager(); } LOG.trace("Created EntityManager {} on {}", entityManager, this); + + super.doStart(); } @Override @@ -518,11 +517,11 @@ public class JpaConsumer extends ScheduledBatchPollingConsumer { @Override protected void doShutdown() throws Exception { - super.doShutdown(); - if (entityManager != null) { this.entityManager.close(); LOG.trace("Closed EntityManager {} on {}", entityManager, this); } + + super.doShutdown(); } }
