camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] camel git commit: CAMEL-8885: Jpa consumer lock should lock entity if the consumeLockEntity=true. Thanks to Daniel Kowalewski for reporting.
Date Thu, 09 Jul 2015 06:25:09 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 501d5c556 -> faf4d4ac9
  refs/heads/master 167037525 -> abec14bf6


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/abec14bf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/abec14bf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/abec14bf

Branch: refs/heads/master
Commit: abec14bf67b2201715cb966d87498e4c26caf749
Parents: 1670375
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Jul 9 08:31:09 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Jul 9 08:31:09 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/abec14bf/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 bfa861b..6a3c50c 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 {


Mime
View raw message