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/5827b3d5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5827b3d5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5827b3d5 Branch: refs/heads/master Commit: 5827b3d503cfc5763470be5290346e345aff26f0 Parents: 4650af5 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:13 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/5827b3d5/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 0cd26f6..a12f088 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 @@ -1659,7 +1659,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; } }
