You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/01/07 00:04:31 UTC
svn commit: r1556058 -
/cxf/trunk/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
Author: dkulp
Date: Mon Jan 6 23:04:31 2014
New Revision: 1556058
URL: http://svn.apache.org/r1556058
Log:
Fix a potential NPE
Modified:
cxf/trunk/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
Modified: cxf/trunk/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java?rev=1556058&r1=1556057&r2=1556058&view=diff
==============================================================================
--- cxf/trunk/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java (original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java Mon Jan 6 23:04:31 2014
@@ -68,7 +68,7 @@ public class BlueprintBeanLocator implem
if (bm instanceof ExtendedBeanMetadata) {
cls = ((ExtendedBeanMetadata)bm).getRuntimeClass();
}
- if (cls == null && container instanceof ExtendedBlueprintContainer) {
+ if (cls == null && container instanceof ExtendedBlueprintContainer && bm.getClassName() != null) {
try {
cls = ((ExtendedBlueprintContainer)container).loadClass(bm.getClassName());
} catch (ClassNotFoundException cnfe) {