Fixed potential NPE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/01957e8a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/01957e8a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/01957e8a Branch: refs/heads/master Commit: 01957e8ab1fe83f2e7322cff5eebaf30607500cd Parents: f857df9 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Aug 6 09:47:37 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Aug 6 09:47:37 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/processor/RedeliveryErrorHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/01957e8a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java index f4e7a62..46d4f60 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java +++ b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java @@ -829,8 +829,9 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme // 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()); + UnitOfWork uow = exchange.getUnitOfWork(); + if (uow != null && uow.getRouteContext() != null) { + exchange.setProperty(Exchange.FAILURE_ROUTE_ID, uow.getRouteContext().getRoute().getId()); } // the failure processor could also be asynchronous
