cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1556058 - /cxf/trunk/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
Date Mon, 06 Jan 2014 23:04:31 GMT
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) {



Mime
View raw message