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:08 UTC
[camel] branch camel-2.22.x updated (098e959 -> 7b51c64)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-2.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 098e959 Fixed CS
new 534de09 add defensive check (#2684)
new 7b51c64 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.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 534de09d37b551faf72bffa8ab454a19631d7e4d
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.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7b51c640bf7b70b9731e161bb03c3e03cf3aa5c7
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();