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 2021/07/09 07:26:32 UTC
[camel] branch camel-3.11.x updated (ee1f30a -> 08d654d)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from ee1f30a CAMEL-16792: mvel, ognl, spel languages should access all exchange properties in getProperties
new 4010eb0 Fix read-lock behavior (#5816)
new 08d654d CAMEL-16795: Fixed CS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../file/strategy/FileChangedExclusiveReadLockStrategy.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
[camel] 01/02: Fix read-lock behavior (#5816)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4010eb03e42dfdcdeaf320e9ca42be4c19d1f6de
Author: Philippe Schaller <ph...@gmail.com>
AuthorDate: Fri Jul 9 09:22:15 2021 +0200
Fix read-lock behavior (#5816)
---
.../component/file/strategy/FileChangedExclusiveReadLockStrategy.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
index 99e6f2e..b04d33a 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
@@ -87,8 +87,8 @@ public class FileChangedExclusiveReadLockStrategy extends MarkerFileExclusiveRea
LOG.trace("Previous length: {}, new length: {}", length, newLength);
LOG.trace("New older than threshold: {}", newOlderThan);
- if (newLength >= minLength && minAge == 0 && newLastModified == lastModified && newLength == length
- || minAge != 0 && newLastModified < newOlderThan) {
+ if (newLength >= minLength && ((minAge == 0 && newLastModified == lastModified && newLength == length)
+ || (minAge != 0 && newLastModified < newOlderThan))) {
LOG.trace("Read lock acquired.");
exclusive = true;
} else {
[camel] 02/02: CAMEL-16795: Fixed CS
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 08d654ddfdb3f9a3201cf1a7d3dd7c2a806df85a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jul 9 09:24:02 2021 +0200
CAMEL-16795: Fixed CS
---
.../component/file/strategy/FileChangedExclusiveReadLockStrategy.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
index b04d33a..c3d01f0 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
@@ -87,8 +87,10 @@ public class FileChangedExclusiveReadLockStrategy extends MarkerFileExclusiveRea
LOG.trace("Previous length: {}, new length: {}", length, newLength);
LOG.trace("New older than threshold: {}", newOlderThan);
+ // CHECKSTYLE:OFF
if (newLength >= minLength && ((minAge == 0 && newLastModified == lastModified && newLength == length)
|| (minAge != 0 && newLastModified < newOlderThan))) {
+ // CHECKSTYLE:ON
LOG.trace("Read lock acquired.");
exclusive = true;
} else {