You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/02/08 08:11:05 UTC
svn commit: r1241790 -
/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Author: bvahdat
Date: Wed Feb 8 07:11:05 2012
New Revision: 1241790
URL: http://svn.apache.org/viewvc?rev=1241790&view=rev
Log:
Avoid NPE in the case getComponent(name) returns null.
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1241790&r1=1241789&r2=1241790&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Wed Feb 8 07:11:05 2012
@@ -316,8 +316,13 @@ public class DefaultCamelContext extends
if (componentType.isInstance(component)) {
return componentType.cast(component);
} else {
- throw new IllegalArgumentException("Found component of type: "
- + component.getClass() + " instead of expected: " + componentType);
+ String message;
+ if (component == null) {
+ message = "Did not find component given by the name: " + name;
+ } else {
+ message = "Found component of type: " + component.getClass() + " instead of expected: " + componentType;
+ }
+ throw new IllegalArgumentException(message);
}
}