Author: dkulp
Date: Tue Apr 10 16:24:52 2012
New Revision: 1311837
URL: http://svn.apache.org/viewvc?rev=1311837&view=rev
Log:
Merged revisions 1311832 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1311832 | dkulp | 2012-04-10 12:20:50 -0400 (Tue, 10 Apr 2012) | 1 line
Fix a potential NPE in blueprint configuration
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
Propchange: cxf/branches/2.5.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java?rev=1311837&r1=1311836&r2=1311837&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
(original)
+++
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
Tue Apr 10 16:24:52 2012
@@ -131,11 +131,13 @@ public class ConfigurerImpl implements C
//Aries blueprint 0.3.x
m = ReflectionUtil.findMethod(container.getClass(),
"getRepository");
Object o = ReflectionUtil.setAccessible(m).invoke(container);
- m = ReflectionUtil.findMethod(container.getClass(),
"getRecipe", String.class);
+ m = ReflectionUtil.findMethod(o.getClass(), "getRecipe",
String.class);
o = ReflectionUtil.setAccessible(m).invoke(o, bn); //returns
the recipe
- m = ReflectionUtil.findMethod(o.getClass(), "setProperties",
Object.class);
- if (m != null) {
- ReflectionUtil.setAccessible(m).invoke(o, beanInstance);
+ if (o != null) {
+ m = ReflectionUtil.findMethod(o.getClass(),
"setProperties", Object.class);
+ if (m != null) {
+ ReflectionUtil.setAccessible(m).invoke(o,
beanInstance);
+ }
}
}
} catch (InvocationTargetException ite) {
