Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@camel.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: davsclaus@apache.org
To: commits@camel.apache.org
Date: Mon, 25 Apr 2016 18:23:11 -0000
Message-Id: <7fb16748d74346e7ac665e5b707f4b1d@git.apache.org>
In-Reply-To: <9d9bfff716eb4e3b8f47ec6fe254d924@git.apache.org>
References: <9d9bfff716eb4e3b8f47ec6fe254d924@git.apache.org>
Subject: [2/3] camel git commit: Fix error handler would log continued(true)
 by default which it should not do.

Fix error handler would log continued(true) by default which it should not do.


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

Branch: refs/heads/camel-2.17.x
Commit: f5f242f513a8de23e6ad0afffdff75cf29421b7b
Parents: 479a3fb
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Mon Apr 25 20:20:52 2016 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Apr 25 20:22:44 2016 +0200

----------------------------------------------------------------------
 .../camel/processor/RedeliveryErrorHandler.java |  2 +-
 .../issues/SplitContinuedLogIssueTest.java      | 84 ++++++++++++++++++++
 2 files changed, 85 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/f5f242f5/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
index d6250eb..d6357b2 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
@@ -733,7 +733,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
         msg = msg + ". Handled and continue routing.";
 
         // log that we failed but want to continue
-        logFailedDelivery(false, false, false, isDeadLetterChannel, true, exchange, msg, data, null);
+        logFailedDelivery(false, false, false, true, isDeadLetterChannel, exchange, msg, data, null);
     }
 
     protected void prepareExchangeForRedelivery(Exchange exchange, RedeliveryData data) {

http://git-wip-us.apache.org/repos/asf/camel/blob/f5f242f5/camel-core/src/test/java/org/apache/camel/issues/SplitContinuedLogIssueTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/issues/SplitContinuedLogIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/SplitContinuedLogIssueTest.java
new file mode 100644
index 0000000..8d35d19
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/issues/SplitContinuedLogIssueTest.java
@@ -0,0 +1,84 @@
+/**
+ * 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.issues;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.processor.aggregate.AggregationStrategy;
+
+public class SplitContinuedLogIssueTest extends ContextTestSupport {
+
+    public void testFooBar() throws Exception {
+        getMockEndpoint("mock:error").expectedBodiesReceived("bar");
+        getMockEndpoint("mock:line").expectedBodiesReceived("foo", "bar");
+        getMockEndpoint("mock:result").expectedBodiesReceived("foo=bar");
+
+        String out = template.requestBody("direct:start", "foo,bar", String.class);
+        assertEquals("foo=bar", out);
+
+        assertMockEndpointsSatisfied();
+    }
+
+    public void testBarFoo() throws Exception {
+        getMockEndpoint("mock:error").expectedBodiesReceived("bar");
+        getMockEndpoint("mock:line").expectedBodiesReceived("bar", "foo");
+        getMockEndpoint("mock:result").expectedBodiesReceived("bar=foo");
+
+        String out = template.requestBody("direct:start", "bar,foo", String.class);
+        assertEquals("bar=foo", out);
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                onException(Exception.class).continued(true).logContinued(false)
+                        .to("log:error", "mock:error");
+
+                from("direct:start")
+                    .split(body(), new SplitAggregationStrategy()).shareUnitOfWork()
+                        .to("mock:line")
+                        .filter(simple("${body} == 'bar'"))
+                            .throwException(new IllegalArgumentException("Forced"))
+                        .end()
+                    .end()
+                    .to("log:result")
+                    .to("mock:result");
+            }
+        };
+    }
+
+    private class SplitAggregationStrategy implements AggregationStrategy {
+
+        @Override
+        public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
+            if (oldExchange == null) {
+                return newExchange;
+            }
+            String s1 = oldExchange.getIn().getBody(String.class);
+            String s2 = newExchange.getIn().getBody(String.class);
+            String body = s1 + "=" + s2;
+            oldExchange.getIn().setBody(body);
+            return oldExchange;
+        }
+    }
+
+}
\ No newline at end of file