svn commit: r943781 - in /camel/branches/camel-1.x/camel-core/src: main/java/org/apache/camel/processor/RoutingSlip.java test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java

[ningjiang]

Author: ningjiang
Date: Thu May 13 03:30:02 2010
New Revision: 943781

URL: http://svn.apache.org/viewvc?rev=943781&view=rev
Log:
CAMEL-2717 Trim the endpont uri before calling the resolveEndpoint in 
RoutingSlip

Modified:
    
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
    
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java

Modified: 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java?rev=943781&r1=943780&r2=943781&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
 (original)
+++ 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
 Thu May 13 03:30:02 2010
@@ -65,7 +65,7 @@ public class RoutingSlip extends Service
         Exchange current = exchange;
 
         for (String nextRecipient : recipients) {
-            Endpoint<Exchange> endpoint = resolveEndpoint(exchange, 
nextRecipient);
+            Endpoint<Exchange> endpoint = resolveEndpoint(exchange, 
nextRecipient.trim());
             Producer<Exchange> producer = producerCache.getProducer(endpoint);
             Exchange ex = current.newInstance();
 

Modified: 
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java?rev=943781&r1=943780&r2=943781&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java
 (original)
+++ 
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java
 Thu May 13 03:30:02 2010
@@ -16,24 +16,17 @@
  */
 package org.apache.camel.processor.routingslip;
 
-import java.util.Map;
-
 import javax.naming.Context;
 
 import org.apache.camel.Body;
 import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Headers;
-import org.apache.camel.OutHeaders;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.util.jndi.JndiContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 public class RoutingSlipDataModificationTest extends ContextTestSupport {
     protected static final String ANSWER = "answer";
     protected static final String ROUTING_SLIP_HEADER = "routingSlipHeader";
-    private static final transient Log LOG = 
LogFactory.getLog(RoutingSlipDataModificationTest.class);
     protected MyBean myBean = new MyBean();
 
     public void testModificationOfDataAlongRoute()
@@ -51,7 +44,7 @@ public class RoutingSlipDataModification
 
     protected void sendBody() {
         template.sendBodyAndHeader("direct:a", ANSWER, ROUTING_SLIP_HEADER,
-                "mock:x,bean:myBean?method=modifyData");
+                "mock:x , bean:myBean?method=modifyData");
     }
 
     @Override