camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [5/5] camel git commit: CAMEL-8592 Fixed the NPE in AbstractListAggregationStrategy if empty list
Date Fri, 03 Apr 2015 02:01:45 GMT
CAMEL-8592 Fixed the NPE in AbstractListAggregationStrategy if empty list


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

Branch: refs/heads/master
Commit: 57f72cd95435f83962443b2f8dc2f5aa2018f225
Parents: 7b4c712
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Fri Apr 3 10:00:21 2015 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Fri Apr 3 10:01:18 2015 +0800

----------------------------------------------------------------------
 .../AbstractListAggregationStrategy.java        |  2 +-
 ...omListAggregationStrategyEmptySplitTest.java | 81 ++++++++++++++++++++
 2 files changed, 82 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/57f72cd9/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
index ad2ec8e..d4ff93f 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
@@ -62,7 +62,7 @@ public abstract class AbstractListAggregationStrategy<V> implements
CompletionAw
 
     @SuppressWarnings("unchecked")
     public void onCompletion(Exchange exchange) {
-        if (isStoreAsBodyOnCompletion()) {
+        if (exchange != null && isStoreAsBodyOnCompletion()) {
             List<V> list = (List<V>) exchange.removeProperty(Exchange.GROUPED_EXCHANGE);
             if (list != null) {
                 exchange.getIn().setBody(list);

http://git-wip-us.apache.org/repos/asf/camel/blob/57f72cd9/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java
b/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java
new file mode 100644
index 0000000..2bf45ef
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java
@@ -0,0 +1,81 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor.aggregator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.processor.aggregate.AbstractListAggregationStrategy;
+
+/**
+ *
+ */
+public class CustomListAggregationStrategyEmptySplitTest extends
+        ContextTestSupport {
+
+    @SuppressWarnings("unchecked")
+    public void testCustomAggregationStrategy() throws Exception {
+        getMockEndpoint("mock:line").expectedBodiesReceived();
+
+        MockEndpoint result = getMockEndpoint("mock:result");
+        result.expectedMessageCount(1);
+        result.message(0).body().isInstanceOf(List.class);
+
+        List<String> body = new ArrayList<String>();
+
+        template.sendBody("direct:start", body);
+
+        assertMockEndpointsSatisfied();
+
+        // the list will be stored as the message body by default
+        List<Integer> numbers = result.getExchanges().get(0).getIn()
+                .getBody(List.class);
+        assertNotNull(numbers);
+        assertEquals(0, numbers.size());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start")
+                        .split(body(), new MyListOfNumbersStrategy())
+                        .to("mock:line").end().to("mock:result");
+            }
+        };
+    }
+
+    /**
+     * Our strategy is irrelevant as getValue will not be called on an empty
+     * list, however this strategy will group a list of integers.
+     */
+    public final class MyListOfNumbersStrategy extends
+            AbstractListAggregationStrategy<Integer> {
+
+        @Override
+        public Integer getValue(Exchange exchange) {
+            String s = exchange.getIn().getBody(String.class);
+            return Integer.valueOf(s);
+        }
+    }
+
+}


Mime
View raw message