Author: davsclaus
Date: Fri Mar 22 14:36:39 2013
New Revision: 1459811
URL: http://svn.apache.org/r1459811
Log:
CAMEL-6199: Fixed camel-blueprint registry to return null when not found in
registry.
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1459809
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java?rev=1459811&r1=1459810&r2=1459811&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
Fri Mar 22 14:36:39 2013
@@ -38,7 +38,11 @@ public class BlueprintContainerRegistry
}
public Object lookup(String name) {
- return blueprintContainer.getComponentInstance(name);
+ try {
+ return blueprintContainer.getComponentInstance(name);
+ } catch (NoSuchComponentException e) {
+ return null;
+ }
}
public <T> T lookup(String name, Class<T> type) {
