commit e7a0b5979b01d0fa999e4c053c3004fe1c43144a
author Jonathan Anstey <janstey@apache.org> Wed Feb 06 11:59:13 2013 +0000
committer Jonathan Anstey <janstey@apache.org> Wed Feb 06 11:59:13 2013 +0000
tree 8b459fc621a19b81315c7de4ffdecf5cd55db5bf
parent b1fad07f29e7bdcc281522cac095f616db5fcc7b

SMXCOMP-963 - StaticRoutingSlip doesn't propagate errors to the caller endpoint when some endpoints in in the slip doesn't exist

git-svn-id: https://svn.apache.org/repos/asf/servicemix/components/trunk@1442920 13f79535-47bb-0310-9956-ffa450edef68

engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/StaticRoutingSlip.java

diff --git a/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/StaticRoutingSlip.java b/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/StaticRoutingSlip.java
index cf46239..e0b751d 100644
--- a/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/StaticRoutingSlip.java
+++ b/engines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/StaticRoutingSlip.java
@@ -233,7 +233,15 @@
                 targets[curIndex.intValue()].configureTarget(me, getContext());
                 store.store(exchange.getExchangeId(), exchange);
                 MessageUtil.transferOutToIn(exchange, me);
-                send(me);
+                try {
+                    send(me);
+                } catch (RuntimeException re) {
+                    // send delivery channel errors back to calling endpoint
+                    if (correlationId != null) {
+                        me = (MessageExchange) store.load(correlationId);                      
+                    } 
+                    fail(me, exchange.getError());
+                } 
                 if (previousId != null) {
                     me = (MessageExchange) store.load(previousId);
                     done(me);