Author: ningjiang
Date: Thu Jan 15 18:03:02 2009
New Revision: 734887
URL: http://svn.apache.org/viewvc?rev=734887&view=rev
Log:
Merged revisions 734727 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r734727 | jstrachan | 2009-01-15 22:53:28 +0800 (Thu, 15 Jan 2009) | 1 line
applied fix for CAMEL-1262
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 15 18:03:02 2009
@@ -1 +1 @@
-/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734392,734422
+/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734392,734422,734727
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java?rev=734887&r1=734886&r2=734887&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java
(original)
+++
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java
Thu Jan 15 18:03:02 2009
@@ -56,6 +56,9 @@
@Override
public boolean add(Exchange exchange) {
Object correlationKey = correlationExpression.evaluate(exchange);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("evaluated expression: " + correlationExpression + " as
CorrelationKey: " + correlationKey);
+ }
Exchange oldExchange = map.get(correlationKey);
Exchange newExchange = exchange;