You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/09/25 19:39:19 UTC
svn commit: r1175442 - in /camel/branches/camel-2.8.x: ./
camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
camel-core/src/test/java/org/apache/camel/processor/RoutingSlipNoSuchEndpointExceptionTest.java
Author: davsclaus
Date: Sun Sep 25 17:39:18 2011
New Revision: 1175442
URL: http://svn.apache.org/viewvc?rev=1175442&view=rev
Log:
Merged revisions 1175438 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Added:
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipNoSuchEndpointExceptionTest.java
- copied unchanged from r1175438, camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipNoSuchEndpointExceptionTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 25 17:39:18 2011
@@ -1 +1 @@
-/camel/trunk:1173732,1173958,1174047,1174129,1174245,1174565,1174626,1174745,1174817,1174837,1175139,1175313,1175321,1175437
+/camel/trunk:1173732,1173958,1174047,1174129,1174245,1174565,1174626,1174745,1174817,1174837,1175139,1175313,1175321,1175437-1175438
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java?rev=1175442&r1=1175441&r2=1175442&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java Sun Sep 25 17:39:18 2011
@@ -162,7 +162,7 @@ public class RoutingSlip extends Service
};
}
- private boolean doRoutingSlip(Exchange exchange, AsyncCallback callback) {
+ private boolean doRoutingSlip(final Exchange exchange, final AsyncCallback callback) {
Exchange current = exchange;
RoutingSlipIterator iter = createRoutingSlipIterator(exchange);
@@ -181,8 +181,8 @@ public class RoutingSlip extends Service
}
} catch (Exception e) {
// error resolving endpoint so we should break out
- exchange.setException(e);
- return true;
+ current.setException(e);
+ break;
}
// prepare and process the routing slip