[jboss-cvs] JBossAS SVN: r69343 - projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2008-01-25 06:39:49 -0500 (Fri, 25 Jan 2008)
New Revision: 69343

Modified:
   projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/BeanInterceptorMetaDataBridge.java
Log:
Fixed NPE

Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/BeanInterceptorMetaDataBridge.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/BeanInterceptorMetaDataBridge.java	2008-01-25 11:11:00 UTC (rev 69342)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/BeanInterceptorMetaDataBridge.java	2008-01-25 11:39:49 UTC (rev 69343)
@@ -60,6 +60,7 @@
 
    private static boolean add(InterceptorsImpl interceptors, ClassLoader classLoader, InterceptorBindingMetaData binding)
    {
+      boolean result = false;
       InterceptorClassesMetaData interceptorClassesMetaData;
       if(binding.isTotalOrdering())
       {
@@ -69,11 +70,14 @@
       {
          interceptorClassesMetaData = binding.getInterceptorClasses();
       }
-      for(String interceptorClassName : interceptorClassesMetaData)
+      if(interceptorClassesMetaData != null)
       {
-         interceptors.addValue(loadClass(classLoader, interceptorClassName));
+         for(String interceptorClassName : interceptorClassesMetaData)
+         {
+            result |= interceptors.addValue(loadClass(classLoader, interceptorClassName));
+         }
       }
-      return true;
+      return result;
    }
    
    protected static boolean add(List<Class<?>> interceptors, ClassLoader classLoader, InterceptorBindingMetaData binding)