camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/5] camel git commit: CAMEL-8077: Fixed potential NPE
Date Sun, 30 Nov 2014 15:23:48 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x a051b1d23 -> 539273bf6
  refs/heads/master e4331eefa -> 5827b3d50


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/759cfd0b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/759cfd0b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/759cfd0b

Branch: refs/heads/master
Commit: 759cfd0b1586793dbf6eb335eba1e894b713f0db
Parents: e4331ee
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sun Nov 30 16:19:38 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Nov 30 16:19:38 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/759cfd0b/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 fe0c5b5..0cd26f6 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().equals(id)) {
+            if (route.getId() != null && route.getId().equals(id)) {
                 return route;
             }
         }


Mime
View raw message