CAMEL-8077: 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/539273bf Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/539273bf Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/539273bf Branch: refs/heads/camel-2.14.x Commit: 539273bf69e27204332e85a8234386aa1b4d1adf Parents: ae8c483 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Nov 30 16:23:13 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Nov 30 16:23:35 2014 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/impl/DefaultCamelContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/539273bf/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java index 18abf63..1645fd8 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java @@ -1461,7 +1461,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon public synchronized RouteDefinition getRouteDefinition(String id) { for (RouteDefinition route : routeDefinitions) { - if (route.getId() != null && route.getId().equals(id)) { + if (route.idOrCreate(nodeIdFactory).equals(id)) { return route; } }
