svn commit: r1559188 - /cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java

[dkulp]

Author: dkulp
Date: Fri Jan 17 17:13:28 2014
New Revision: 1559188

URL: http://svn.apache.org/r1559188
Log:
Merged revisions 1556110 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1556110 | dkulp | 2014-01-06 22:04:43 -0500 (Mon, 06 Jan 2014) | 10 lines

  Merged revisions 1556058 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1556058 | dkulp | 2014-01-06 18:04:31 -0500 (Mon, 06 Jan 2014) | 2 lines

    Fix a potential NPE

  ........

........

Modified:
    
cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java

Modified: 
cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java?rev=1559188&r1=1559187&r2=1559188&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
 Fri Jan 17 17:13:28 2014
@@ -69,7 +69,7 @@ public class BlueprintBeanLocator implem
             if (bm instanceof ExtendedBeanMetadata) {
                 cls = ((ExtendedBeanMetadata)bm).getRuntimeClass();
             } 
-            if (cls == null) {
+            if (cls == null && bm.getClassName() != null) {
                 try {
                     Method m = ReflectionUtil.findMethod(container.getClass(), 
"loadClass", String.class);
                     cls = 
(Class<?>)ReflectionUtil.setAccessible(m).invoke(container, bm.getClassName());