Author: davsclaus
Date: Sat Jan 12 12:20:27 2013
New Revision: 1432415
URL: http://svn.apache.org/viewvc?rev=1432415&view=rev
Log:
CAMEL-5959: Made the failed route id available for end users in Camel error
handler.
Added:
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelFailureRouteIdTest.java
- copied unchanged from r1432413,
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelFailureRouteIdTest.java
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerFailureRouteIdTest.java
- copied unchanged from r1432413,
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerFailureRouteIdTest.java
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/OnExceptionFailureRouteIdTest.java
- copied unchanged from r1432413,
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnExceptionFailureRouteIdTest.java
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/Exchange.java
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1432413
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/Exchange.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/Exchange.java?rev=1432415&r1=1432414&r2=1432415&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/Exchange.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/Exchange.java
Sat Jan 12 12:20:27 2013
@@ -111,6 +111,7 @@ public interface Exchange {
String FAILURE_HANDLED = "CamelFailureHandled";
String FAILURE_ENDPOINT = "CamelFailureEndpoint";
+ String FAILURE_ROUTE_ID = "CamelFailureRouteId";
String FILTER_NON_XML_CHARS = "CamelFilterNonXmlChars";
String FILE_LOCAL_WORK_PATH = "CamelFileLocalWorkPath";
String FILE_NAME = "CamelFileName";
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java?rev=1432415&r1=1432414&r2=1432415&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
Sat Jan 12 12:20:27 2013
@@ -760,6 +760,10 @@ public abstract class RedeliveryErrorHan
// store the last to endpoint as the failure endpoint
exchange.setProperty(Exchange.FAILURE_ENDPOINT,
exchange.getProperty(Exchange.TO_ENDPOINT));
+ // and store the route id so we know in which route we failed
+ if (exchange.getUnitOfWork().getRouteContext() != null) {
+ exchange.setProperty(Exchange.FAILURE_ROUTE_ID,
exchange.getUnitOfWork().getRouteContext().getRoute().getId());
+ }
// the failure processor could also be asynchronous
AsyncProcessor afp =
AsyncProcessorConverterHelper.convert(processor);
@@ -836,6 +840,10 @@ public abstract class RedeliveryErrorHan
exchange.setException(exchange.getProperty(Exchange.EXCEPTION_CAUGHT,
Exception.class));
// and put failure endpoint back as well
exchange.setProperty(Exchange.FAILURE_ENDPOINT,
exchange.getProperty(Exchange.TO_ENDPOINT));
+ // and store the route id so we know in which route we failed
+ if (exchange.getUnitOfWork().getRouteContext() != null) {
+ exchange.setProperty(Exchange.FAILURE_ROUTE_ID,
exchange.getUnitOfWork().getRouteContext().getRoute().getId());
+ }
}
}