Author: hadrian
Date: Fri Feb 10 03:43:46 2012
New Revision: 1242654
URL: http://svn.apache.org/viewvc?rev=1242654&view=rev
Log:
Merged revisions 1237589 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1237589 | davsclaus | 2012-01-30 05:16:23 -0500 (Mon, 30 Jan 2012) | 1 line
Polished
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Propchange: camel/branches/camel-2.9.x/camel-core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 10 03:43:46 2012
@@ -14,3 +14,4 @@ eclipse-classes
*.ipr
*.iml
*.iws
+*.idea
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java?rev=1242654&r1=1242653&r2=1242654&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
Fri Feb 10 03:43:46 2012
@@ -918,7 +918,7 @@ public class AggregateProcessor extends
// only run if CamelContext has been fully started
if (!camelContext.getStatus().isStarted()) {
- LOG.warn("cannot start force completion because CamelContext({})
has not been started yet", camelContext.getName());
+ LOG.warn("Cannot start force completion of all groups because
CamelContext({}) has not been started", camelContext.getName());
return;
}
@@ -934,7 +934,7 @@ public class AggregateProcessor extends
for (String key : keys) {
Exchange exchange =
aggregationRepository.get(camelContext, key);
if (exchange != null) {
- LOG.trace("force completion triggered for correlation
key: {}", key);
+ LOG.trace("Force completion triggered for correlation
key: {}", key);
// indicate it was completed by a force completion
request
exchange.setProperty(Exchange.AGGREGATED_COMPLETED_BY,
"forceCompletion");
onCompletion(key, exchange, false);
