svn commit: r1346283 - in /camel/branches/camel-2.8.x: ./ examples/camel-example-aggregate/ examples/camel-example-aggregate/src/main/java/org/apache/camel/example/NumberAggregationStrategy.java

[davsclaus]

Author: davsclaus
Date: Tue Jun  5 08:02:27 2012
New Revision: 1346283

URL: http://svn.apache.org/viewvc?rev=1346283&view=rev
Log:
CAMEL-5333: Fixed the camel aggregation example generates an error whenever the 
completion predicate is entered.

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/examples/camel-example-aggregate/   (props 
changed)
    
camel/branches/camel-2.8.x/examples/camel-example-aggregate/src/main/java/org/apache/camel/example/NumberAggregationStrategy.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1346281
  Merged /camel/branches/camel-2.9.x:r1346282

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Propchange: camel/branches/camel-2.8.x/examples/camel-example-aggregate/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun  5 08:02:27 2012
@@ -14,3 +14,5 @@ eclipse-classes
 *.ipr
 *.iml
 *.iws
+*.idea
+data

Modified: 
camel/branches/camel-2.8.x/examples/camel-example-aggregate/src/main/java/org/apache/camel/example/NumberAggregationStrategy.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-aggregate/src/main/java/org/apache/camel/example/NumberAggregationStrategy.java?rev=1346283&r1=1346282&r2=1346283&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/examples/camel-example-aggregate/src/main/java/org/apache/camel/example/NumberAggregationStrategy.java
 (original)
+++ 
camel/branches/camel-2.8.x/examples/camel-example-aggregate/src/main/java/org/apache/camel/example/NumberAggregationStrategy.java
 Tue Jun  5 08:02:27 2012
@@ -32,6 +32,12 @@ public class NumberAggregationStrategy i
             return newExchange;
         }
 
+        // check for stop command
+        String input = newExchange.getIn().getBody(String.class);
+        if ("STOP".equalsIgnoreCase(input)) {
+            return oldExchange;
+        }
+
         Integer num1 = oldExchange.getIn().getBody(Integer.class);
         Integer num2 = newExchange.getIn().getBody(Integer.class);