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/8170f34e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8170f34e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8170f34e Branch: refs/heads/camel-2.10.x Commit: 8170f34e9a3a18db30a98a4b80b0d7293bda20b3 Parents: ee5ca5c Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Sep 14 12:57:13 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Sep 14 12:58:12 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/8170f34e/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 63fbe2a..dddb6e1 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 @@ -844,8 +844,9 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme // 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()); + UnitOfWork uow = exchange.getUnitOfWork(); + if (uow != null && uow.getRouteContext() != null) { + exchange.setProperty(Exchange.FAILURE_ROUTE_ID, uow.getRouteContext().getRoute().getId()); } } }
