You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/03/24 15:11:16 UTC
[camel] branch main updated: (chores) camel-file: consolidate duplicated code
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 1956fe6bef2 (chores) camel-file: consolidate duplicated code
1956fe6bef2 is described below
commit 1956fe6bef27f7a8f68cbdef19691fc825997ba0
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Mar 24 14:51:51 2023 +0100
(chores) camel-file: consolidate duplicated code
---
.../FileIdempotentChangedRepositoryReadLockStrategy.java | 16 +++++-----------
.../FileIdempotentRepositoryReadLockStrategy.java | 16 +++++-----------
2 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentChangedRepositoryReadLockStrategy.java b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentChangedRepositoryReadLockStrategy.java
index 09215d0c057..355630c7eaf 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentChangedRepositoryReadLockStrategy.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentChangedRepositoryReadLockStrategy.java
@@ -137,6 +137,10 @@ public class FileIdempotentChangedRepositoryReadLockStrategy extends ServiceSupp
}
};
+ delayOrScheduleLockRelease(r);
+ }
+
+ private void delayOrScheduleLockRelease(Runnable r) throws InterruptedException {
if (readLockIdempotentReleaseDelay > 0 && readLockIdempotentReleaseExecutorService != null) {
LOG.debug("Scheduling read lock release task to run asynchronous delayed after {} millis",
readLockIdempotentReleaseDelay);
@@ -170,17 +174,7 @@ public class FileIdempotentChangedRepositoryReadLockStrategy extends ServiceSupp
}
};
- if (readLockIdempotentReleaseDelay > 0 && readLockIdempotentReleaseExecutorService != null) {
- LOG.debug("Scheduling read lock release task to run asynchronous delayed after {} millis",
- readLockIdempotentReleaseDelay);
- readLockIdempotentReleaseExecutorService.schedule(r, readLockIdempotentReleaseDelay, TimeUnit.MILLISECONDS);
- } else if (readLockIdempotentReleaseDelay > 0) {
- LOG.debug("Delaying read lock release task {} millis", readLockIdempotentReleaseDelay);
- Thread.sleep(readLockIdempotentReleaseDelay);
- r.run();
- } else {
- r.run();
- }
+ delayOrScheduleLockRelease(r);
}
@Override
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRepositoryReadLockStrategy.java b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRepositoryReadLockStrategy.java
index dacf2325ab7..248c4a8148c 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRepositoryReadLockStrategy.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRepositoryReadLockStrategy.java
@@ -111,17 +111,7 @@ public class FileIdempotentRepositoryReadLockStrategy extends ServiceSupport
}
};
- if (readLockIdempotentReleaseDelay > 0 && readLockIdempotentReleaseExecutorService != null) {
- LOG.debug("Scheduling read lock release task to run asynchronous delayed after {} millis",
- readLockIdempotentReleaseDelay);
- readLockIdempotentReleaseExecutorService.schedule(r, readLockIdempotentReleaseDelay, TimeUnit.MILLISECONDS);
- } else if (readLockIdempotentReleaseDelay > 0) {
- LOG.debug("Delaying read lock release task {} millis", readLockIdempotentReleaseDelay);
- Thread.sleep(readLockIdempotentReleaseDelay);
- r.run();
- } else {
- r.run();
- }
+ delayOrScheduleLockRelease(r);
}
@Override
@@ -138,6 +128,10 @@ public class FileIdempotentRepositoryReadLockStrategy extends ServiceSupport
}
};
+ delayOrScheduleLockRelease(r);
+ }
+
+ private void delayOrScheduleLockRelease(Runnable r) throws InterruptedException {
if (readLockIdempotentReleaseDelay > 0 && readLockIdempotentReleaseExecutorService != null) {
LOG.debug("Scheduling read lock release task to run asynchronous delayed after {} millis",
readLockIdempotentReleaseDelay);