Repository: camel Updated Branches: refs/heads/master d9088dd0e -> 4d005d9a5
improve grammar of "Limiting maximum messages to poll..." debug log messages Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0151ad31 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0151ad31 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0151ad31 Branch: refs/heads/master Commit: 0151ad31c561e0533831345f8dd13262bb9e6781 Parents: e784761 Author: Pascal Schumacher <pascalschumac...@gmx.net> Authored: Fri Jun 17 17:39:16 2016 +0200 Committer: Pascal Schumacher <pascalschumac...@gmx.net> Committed: Fri Jun 17 17:39:16 2016 +0200 ---------------------------------------------------------------------- .../org/apache/camel/component/file/GenericFileConsumer.java | 6 +++--- .../java/org/apache/camel/component/hbase/HBaseConsumer.java | 2 +- .../java/org/apache/camel/component/ibatis/IBatisConsumer.java | 2 +- .../main/java/org/apache/camel/component/jpa/JpaConsumer.java | 2 +- .../java/org/apache/camel/component/krati/KratiConsumer.java | 2 +- .../java/org/apache/camel/component/mail/MailConsumer.java | 2 +- .../org/apache/camel/component/mybatis/MyBatisConsumer.java | 2 +- .../main/java/org/apache/camel/component/sql/SqlConsumer.java | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0151ad31/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java index bf7dc23..72d4ed1 100644 --- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java +++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java @@ -145,7 +145,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum // log if we hit the limit if (limitHit) { - log.debug("Limiting maximum messages to poll at {} files as there was more messages in this poll.", maxMessagesPerPoll); + log.debug("Limiting maximum messages to poll at {} files as there were more messages in this poll.", maxMessagesPerPoll); } // sort files using file comparator if provided @@ -176,7 +176,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum // we are not eager limiting, but we have configured a limit, so cut the list of files if (!eagerLimitMaxMessagesPerPoll && maxMessagesPerPoll > 0) { if (files.size() > maxMessagesPerPoll) { - log.debug("Limiting maximum messages to poll at {} files as there was more messages in this poll.", maxMessagesPerPoll); + log.debug("Limiting maximum messages to poll at {} files as there were more messages in this poll.", maxMessagesPerPoll); // must first remove excessive files from the in progress repository removeExcessiveInProgressFiles(q, maxMessagesPerPoll); } @@ -201,7 +201,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum // limit if needed if (maxMessagesPerPoll > 0 && total > maxMessagesPerPoll) { - log.debug("Limiting to maximum messages to poll {} as there was {} messages in this poll.", maxMessagesPerPoll, total); + log.debug("Limiting to maximum messages to poll {} as there were {} messages in this poll.", maxMessagesPerPoll, total); total = maxMessagesPerPoll; } http://git-wip-us.apache.org/repos/asf/camel/blob/0151ad31/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java index b54b284..2d5f8ba 100644 --- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java +++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java @@ -153,7 +153,7 @@ public class HBaseConsumer extends ScheduledBatchPollingConsumer { // limit if needed if (maxMessagesPerPoll > 0 && total > maxMessagesPerPoll) { - LOG.debug("Limiting to maximum messages to poll {} as there was {} messages in this poll.", maxMessagesPerPoll, total); + LOG.debug("Limiting to maximum messages to poll {} as there were {} messages in this poll.", maxMessagesPerPoll, total); total = maxMessagesPerPoll; } http://git-wip-us.apache.org/repos/asf/camel/blob/0151ad31/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisConsumer.java b/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisConsumer.java index 2db7341..0b0577d 100644 --- a/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisConsumer.java +++ b/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisConsumer.java @@ -117,7 +117,7 @@ public class IBatisConsumer extends ScheduledBatchPollingConsumer { // limit if needed if (maxMessagesPerPoll > 0 && total > maxMessagesPerPoll) { - LOG.debug("Limiting to maximum messages to poll " + maxMessagesPerPoll + " as there was " + total + " messages in this poll."); + LOG.debug("Limiting to maximum messages to poll " + maxMessagesPerPoll + " as there were " + total + " messages in this poll."); total = maxMessagesPerPoll; } http://git-wip-us.apache.org/repos/asf/camel/blob/0151ad31/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java index 1e295e2..f85d650 100644 --- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java +++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java @@ -165,7 +165,7 @@ public class JpaConsumer extends ScheduledBatchPollingConsumer { // limit if needed if (maxMessagesPerPoll > 0 && total > maxMessagesPerPoll) { - LOG.debug("Limiting to maximum messages to poll " + maxMessagesPerPoll + " as there was " + total + " messages in this poll."); + LOG.debug("Limiting to maximum messages to poll " + maxMessagesPerPoll + " as there were " + total + " messages in this poll."); total = maxMessagesPerPoll; } http://git-wip-us.apache.org/repos/asf/camel/blob/0151ad31/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java b/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java index 0a18ab7..708787b 100644 --- a/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java +++ b/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java @@ -68,7 +68,7 @@ public class KratiConsumer extends ScheduledBatchPollingConsumer { // did we cap at max? if (index == max && keyIterator.hasNext()) { - log.debug("Limiting to maximum messages to poll {} as there was more messages in this poll.", max); + log.debug("Limiting to maximum messages to poll {} as there were more messages in this poll.", max); } return queue.isEmpty() ? 0 : processBatch(CastUtils.cast(queue)); http://git-wip-us.apache.org/repos/asf/camel/blob/0151ad31/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java index fc1417e..29ae278 100644 --- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java +++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java @@ -176,7 +176,7 @@ public class MailConsumer extends ScheduledBatchPollingConsumer { // limit if needed if (maxMessagesPerPoll > 0 && total > maxMessagesPerPoll) { - LOG.debug("Limiting to maximum messages to poll {} as there was {} messages in this poll.", maxMessagesPerPoll, total); + LOG.debug("Limiting to maximum messages to poll {} as there were {} messages in this poll.", maxMessagesPerPoll, total); total = maxMessagesPerPoll; } http://git-wip-us.apache.org/repos/asf/camel/blob/0151ad31/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java index 0547e29..9cdce3e 100644 --- a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java +++ b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java @@ -107,7 +107,7 @@ public class MyBatisConsumer extends ScheduledBatchPollingConsumer { // limit if needed if (maxMessagesPerPoll > 0 && total > maxMessagesPerPoll) { - LOG.debug("Limiting to maximum messages to poll " + maxMessagesPerPoll + " as there was " + total + " messages in this poll."); + LOG.debug("Limiting to maximum messages to poll " + maxMessagesPerPoll + " as there were " + total + " messages in this poll."); total = maxMessagesPerPoll; } http://git-wip-us.apache.org/repos/asf/camel/blob/0151ad31/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java index ab48133..eef60fe 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java @@ -212,7 +212,7 @@ public class SqlConsumer extends ScheduledBatchPollingConsumer { // limit if needed if (maxMessagesPerPoll > 0 && total == maxMessagesPerPoll) { - log.debug("Limiting to maximum messages to poll " + maxMessagesPerPoll + " as there was more messages in this poll."); + log.debug("Limiting to maximum messages to poll " + maxMessagesPerPoll + " as there were more messages in this poll."); } for (int index = 0; index < total && isBatchAllowed(); index++) {
