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/07/09 08:25:10 UTC

[2/2] camel git commit: CAMEL-8885: Jpa consumer lock should lock entity if the consumeLockEntity=true. Thanks to Daniel Kowalewski for reporting.

CAMEL-8885: Jpa consumer lock should lock entity if the consumeLockEntity=true. Thanks to Daniel Kowalewski for reporting.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/faf4d4ac
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/faf4d4ac
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/faf4d4ac

Branch: refs/heads/camel-2.15.x
Commit: faf4d4ac92ef77ef00a2abfc81e2d7272af1d35d
Parents: 501d5c5
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 9 08:31:09 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 9 08:31:33 2015 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/camel/component/jpa/JpaConsumer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/faf4d4ac/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 850b922..b378e8d 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
@@ -322,7 +322,7 @@ public class JpaConsumer extends ScheduledBatchPollingConsumer {
      * @return true if the entity was locked
      */
     protected boolean lockEntity(Object entity, EntityManager entityManager) {
-        if (!getEndpoint().isConsumeDelete() || !getEndpoint().isConsumeLockEntity()) {
+        if (!getEndpoint().isConsumeLockEntity()) {
             return true;
         }
         try {