You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2013/10/13 20:42:32 UTC
git commit: Polished.
Updated Branches:
refs/heads/master baf36ab78 -> 32f32b94a
Polished.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/32f32b94
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/32f32b94
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/32f32b94
Branch: refs/heads/master
Commit: 32f32b94a89d223903c0f7f33de9877a06e0ab5f
Parents: baf36ab
Author: Babak Vahdat <bv...@apache.org>
Authored: Sun Oct 13 20:41:35 2013 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Sun Oct 13 20:41:35 2013 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/jpa/JpaProducer.java | 3 +--
.../apache/camel/processor/jpa/JpaProducerConcurrentTest.java | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/32f32b94/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
index 476ba6d..8393a9e 100644
--- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
+++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
@@ -96,12 +96,11 @@ public class JpaProducer extends DefaultProducer {
*/
private Object save(final Object entity, EntityManager entityManager) {
// there may be concurrency so need to join tx before persist/merge
+ entityManager.joinTransaction();
if (endpoint.isUsePersist()) {
- entityManager.joinTransaction();
entityManager.persist(entity);
return entity;
} else {
- entityManager.joinTransaction();
return entityManager.merge(entity);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/32f32b94/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
index 52b31d3..8005e41 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
@@ -69,9 +69,9 @@ public class JpaProducerConcurrentTest extends AbstractJpaTest {
// get them so they are complete
for (Future<SendEmail> future : responses.values()) {
- SendEmail sendMail = future.get();
- assertNotNull(sendMail);
- log.info("Got the managed entity {} with the id {}", sendMail, sendMail.getId());
+ SendEmail sendEmail = future.get();
+ assertNotNull(sendEmail);
+ log.info("Persisted the SendEmail entity with the id {} and the address {}", sendEmail.getId(), sendEmail.getAddress());
}
// assert in the database