Repository: camel Updated Branches: refs/heads/camel-2.15.x ec24b75c0 -> 958196458 refs/heads/camel-2.16.x f141e4211 -> e34882f58 refs/heads/master 06cebec80 -> 6b2a7b12a
CAMEL-9316: LevelDBAggregationRepository is logging warnings when exchange is already complete on first aggregation Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6b2a7b12 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6b2a7b12 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6b2a7b12 Branch: refs/heads/master Commit: 6b2a7b12a6761ea2af865c55d4a41cbad00dae98 Parents: 06cebec Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Nov 21 10:33:50 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Nov 21 10:33:50 2015 +0100 ---------------------------------------------------------------------- .../leveldb/LevelDBAggregationRepository.java | 21 ++++++-------------- 1 file changed, 6 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6b2a7b12/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java ---------------------------------------------------------------------- diff --git a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java index a7af5bf..b13f541 100644 --- a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java +++ b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java @@ -173,8 +173,6 @@ public class LevelDBAggregationRepository extends ServiceSupport implements Reco } finally { batch.close(); } - } else { - LOG.warn("Unable to remove key {} from repository {}: Not Found", key, repositoryName); } } catch (IOException e) { @@ -192,8 +190,6 @@ public class LevelDBAggregationRepository extends ServiceSupport implements Reco if (rc != null) { levelDBFile.getDb().delete(confirmedLDBKey); LOG.trace("Removed confirm index {} -> {}", exchangeId, new Buffer(rc)); - } else { - LOG.warn("Unable to confirm exchangeId [{}]", exchangeId + " from repository " + repositoryName + ": Not Found"); } } @@ -207,7 +203,7 @@ public class LevelDBAggregationRepository extends ServiceSupport implements Reco DBIterator it = levelDBFile.getDb().iterator(); - String keyBuffer = null; + String keyBuffer; try { String prefix = repositoryName + '\0'; for (it.seek(keyBuilder(repositoryName, "")); it.hasNext(); it.next()) { @@ -222,10 +218,8 @@ public class LevelDBAggregationRepository extends ServiceSupport implements Reco String key = keyBuffer.substring(prefix.length()); - if (key != null) { - LOG.trace("getKey [{}]", key); - keys.add(key); - } + LOG.trace("getKey [{}]", key); + keys.add(key); } } finally { // Make sure you close the iterator to avoid resource leaks. @@ -244,7 +238,7 @@ public class LevelDBAggregationRepository extends ServiceSupport implements Reco DBIterator it = levelDBFile.getDb().iterator(); - String keyBuffer = null; + String keyBuffer; try { String prefix = getRepositoryNameCompleted() + '\0'; @@ -256,11 +250,8 @@ public class LevelDBAggregationRepository extends ServiceSupport implements Reco } String exchangeId = keyBuffer.substring(prefix.length()); - if (exchangeId != null) { - LOG.trace("Scan exchangeId [{}]", exchangeId); - answer.add(exchangeId); - } - + LOG.trace("Scan exchangeId [{}]", exchangeId); + answer.add(exchangeId); } } finally { // Make sure you close the iterator to avoid resource leaks.
