Updated Branches: refs/heads/camel-2.11.x fef28ef01 -> 6f06403c2 refs/heads/camel-2.12.x 6751da910 -> 6204c43bd refs/heads/master 000581e67 -> 5f499fbeb
CAMEL-6967: Dont trunk file store if store not created yet. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5f499fbe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5f499fbe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5f499fbe Branch: refs/heads/master Commit: 5f499fbeb8a4b82c526a98a6d26bcc7353f44813 Parents: 000581e Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Nov 18 11:50:00 2013 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Nov 18 11:50:00 2013 +0100 ---------------------------------------------------------------------- .../processor/idempotent/FileIdempotentRepository.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5f499fbe/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java b/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java index 921b4a4..98c19e6 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java +++ b/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java @@ -260,6 +260,10 @@ public class FileIdempotentRepository extends ServiceSupport implements Idempote * to the file store. */ protected void trunkStore() { + if (fileStore == null || !fileStore.exists()) { + return; + } + LOG.info("Trunking idempotent filestore: {}", fileStore); FileOutputStream fos = null; try { @@ -279,12 +283,12 @@ public class FileIdempotentRepository extends ServiceSupport implements Idempote * Loads the given file store into the 1st level cache */ protected void loadStore() { - LOG.trace("Loading to 1st level cache from idempotent filestore: {}", fileStore); - - if (!fileStore.exists()) { + if (fileStore == null || !fileStore.exists()) { return; } + LOG.trace("Loading to 1st level cache from idempotent filestore: {}", fileStore); + cache.clear(); Scanner scanner = null; try {
