[jboss-cvs] JBossAS SVN: r67048 - trunk/ejb3/src/main/org/jboss/ejb3.

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

Author: adrian at jboss.org
Date: 2007-11-13 17:04:18 -0500 (Tue, 13 Nov 2007)
New Revision: 67048

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
Log:
[EJBTHREE-1067] - Complete the fix for the NPE when interceptor binding or classes is null

Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-11-13 22:02:17 UTC (rev 67047)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-11-13 22:04:18 UTC (rev 67048)
@@ -1122,15 +1122,24 @@
       Interceptors interceptors = (Interceptors) container
             .resolveAnnotation(Interceptors.class);
       InterceptorsImpl impl = InterceptorsImpl.getImpl(interceptors);
-      for (String name : binding.getInterceptorClasses())
+      if (binding != null)
       {
-         Class<?> clazz = di.getClassLoader().loadClass(name);
-         impl.addValue(clazz);
+         InterceptorClassesMetaData classes = binding.getInterceptorClasses();
+         if (classes != null)
+         {
+            for (String name : classes)
+            {
+               Class<?> clazz = di.getClassLoader().loadClass(name);
+               impl.addValue(clazz);
+            }
+         }
       }
 
       addClassAnnotation(container, impl.annotationType(), impl);
 
-      boolean exclude = binding.isExcludeDefaultInterceptors();
+      boolean exclude = false;
+      if (binding != null)
+         exclude = binding.isExcludeDefaultInterceptors();
       if (exclude
             && container.resolveAnnotation(ExcludeDefaultInterceptors.class) == null)
       {
@@ -1221,7 +1230,7 @@
 
             boolean excludeClass = false;
             if (binding != null)
-               binding.isExcludeClassInterceptors();
+               excludeClass = binding.isExcludeClassInterceptors();
             if (excludeClass
                   && container.resolveAnnotation(method,
                         ExcludeClassInterceptors.class) == null)