You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/03/03 11:23:07 UTC

[3/3] camel git commit: CAMEL-10084: Improve javadoc

CAMEL-10084: Improve javadoc


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d9caf8c7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d9caf8c7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d9caf8c7

Branch: refs/heads/master
Commit: d9caf8c736f2de29fe0fd0a8d64aff23539b34b4
Parents: 00e27d6
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Mar 3 10:48:24 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Mar 3 12:22:58 2017 +0100

----------------------------------------------------------------------
 .../org/apache/camel/processor/aggregate/AggregationStrategy.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d9caf8c7/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategy.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategy.java
index c593fa4..145ae80 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategy.java
@@ -54,7 +54,7 @@ public interface AggregationStrategy {
      *
      * @param oldExchange the oldest exchange (is <tt>null</tt> on first aggregation as we only have the new exchange)
      * @param newExchange the newest exchange (can be <tt>null</tt> if there was no data possible to acquire)
-     * @return a combined composite of the two exchanges
+     * @return a combined composite of the two exchanges, favor returning the <tt>oldExchange</tt> whenever possible
      */
     Exchange aggregate(Exchange oldExchange, Exchange newExchange);
 }