You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/07/15 04:17:34 UTC

[1/2] git commit: Fixed the CS error of camel-core

Updated Branches:
  refs/heads/master 76f700336 -> 8be7f79d6


Fixed the CS error of camel-core


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

Branch: refs/heads/master
Commit: 449dd39a01a6867815a063f266ba5fa7460f0ced
Parents: 76f7003
Author: Willem Jiang <ni...@apache.org>
Authored: Mon Jul 15 10:16:17 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Mon Jul 15 10:16:17 2013 +0800

----------------------------------------------------------------------
 .../java/org/apache/camel/processor/DefaultExchangeFormatter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/449dd39a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
index 0ba9f1b..fe12d94 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
@@ -58,7 +58,8 @@ public class DefaultExchangeFormatter implements ExchangeFormatter {
     private String style(String label) {
         if (style == OutputStyle.Default) {
             return String.format(", %s: ", label);
-        } if (style == OutputStyle.Tab) {
+        } 
+        if (style == OutputStyle.Tab) {
             return String.format("\t%s: ", label);
         } else {
             return String.format("\t%-20s", label);


[2/2] git commit: Added an unit test based on users mailinglist

Posted by ni...@apache.org.
Added an unit test based on users mailinglist


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

Branch: refs/heads/master
Commit: 8be7f79d66deafea3d71d492d8a31f037d21ec24
Parents: 449dd39
Author: Willem Jiang <ni...@apache.org>
Authored: Mon Jul 15 10:16:50 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Mon Jul 15 10:16:50 2013 +0800

----------------------------------------------------------------------
 .../java/org/apache/camel/language/spel/SpelRouteTest.java   | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8be7f79d/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java
index bc48b4b..4632c39 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java
@@ -29,6 +29,13 @@ public class SpelRouteTest extends ContextTestSupport {
         template.sendBodyAndHeader("direct:test", "World", "dayOrNight", "day");
         resultEndpoint.assertIsSatisfied();
     }
+    
+    public void testSpelWithLoop() throws Exception {
+        MockEndpoint resultEndpoint = getMockEndpoint("mock:loopResult");
+        resultEndpoint.expectedBodiesReceived("A:0", "A:0:1", "A:0:1:2", "A:0:1:2:3");
+        template.sendBody("direct:loop", "A");
+        resultEndpoint.assertIsSatisfied();
+    }
 
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
@@ -36,6 +43,7 @@ public class SpelRouteTest extends ContextTestSupport {
             @Override
             public void configure() {
                 from("direct:test").setBody(spel("Hello #{request.body}! What a beautiful #{request.headers['dayOrNight']}")).to("mock:result");
+                from("direct:loop").loop(4).setBody(spel("#{body + ':' + properties['CamelLoopIndex']}")).to("mock:loopResult");
             }
         };
     }