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 2018/12/21 20:48:11 UTC
[camel] branch camel-2.21.x updated (bef8fdb -> 0b82d18)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from bef8fdb Fixed CS
new 5b6958a add defensive check (#2684)
new 0b82d18 CAMEL-13025: File read lock - If file gets deleted then break out loop
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 | 5 +++++
.../component/file/strategy/FileLockExclusiveReadLockStrategy.java | 5 +++++
2 files changed, 10 insertions(+)
[camel] 01/02: add defensive check (#2684)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5b6958ab06422d596b1aa357994184f6f7219851
Author: vgvineet4 <vg...@gmail.com>
AuthorDate: Sat Dec 22 02:02:33 2018 +0530
add defensive check (#2684)
---
.../file/strategy/FileChangedExclusiveReadLockStrategy.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
index e2a274f..9aa7698 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
@@ -71,6 +71,11 @@ public class FileChangedExclusiveReadLockStrategy extends MarkerFileExclusiveRea
}
}
+ if(!target.exists()) {
+ CamelLogger.log(LOG,readLockLoggingLevel,"File "+target.getName()+" got deleted.");
+ return false;
+ }
+
long newLastModified = target.lastModified();
long newLength = target.length();
long newOlderThan = startTime + watch.taken() - minAge;
[camel] 02/02: CAMEL-13025: File read lock - If file gets deleted
then break out loop
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0b82d18d9b8bda5365d35ffda57c3f7abcca05e7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 21 21:34:58 2018 +0100
CAMEL-13025: File read lock - If file gets deleted then break out loop
---
.../file/strategy/FileChangedExclusiveReadLockStrategy.java | 6 +++---
.../component/file/strategy/FileLockExclusiveReadLockStrategy.java | 5 +++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
index 9aa7698..951dc24 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
@@ -71,9 +71,9 @@ public class FileChangedExclusiveReadLockStrategy extends MarkerFileExclusiveRea
}
}
- if(!target.exists()) {
- CamelLogger.log(LOG,readLockLoggingLevel,"File "+target.getName()+" got deleted.");
- return false;
+ if (!target.exists()) {
+ CamelLogger.log(LOG, readLockLoggingLevel, "Cannot acquire read lock as file no longer exists. Will skip the file: " + file);
+ return false;
}
long newLastModified = target.lastModified();
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java
index d43d1bc..ea4de82 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java
@@ -86,6 +86,11 @@ public class FileLockExclusiveReadLockStrategy extends MarkerFileExclusiveReadLo
}
}
+ if (!target.exists()) {
+ CamelLogger.log(LOG, readLockLoggingLevel, "Cannot acquire read lock as file no longer exists. Will skip the file: " + file);
+ return false;
+ }
+
// get the lock using either try lock or not depending on if we are using timeout or not
try {
lock = timeout > 0 ? channel.tryLock() : channel.lock();