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 2013/09/14 12:58:57 UTC
[3/4] git commit: Fixed potential NPE
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/a6ec08af
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a6ec08af
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a6ec08af
Branch: refs/heads/camel-2.11.x
Commit: a6ec08af0c08e51aaaa31f49cfc09f64884eaa66
Parents: 4225d51
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 14 12:57:13 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 14 12:57:52 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/a6ec08af/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 f34b467..57bf1f2 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
@@ -899,8 +899,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());
}
}
}