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

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

Author: ALRubinger
Date: 2008-04-13 20:49:36 -0400 (Sun, 13 Apr 2008)
New Revision: 72145

Modified:
   projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/InjectInterceptorsFactory.java
Log:
[EJBTHREE-1272] Fixed NPE, for Carlo review before resolving issue

Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/InjectInterceptorsFactory.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/InjectInterceptorsFactory.java	2008-04-13 20:22:35 UTC (rev 72144)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/InjectInterceptorsFactory.java	2008-04-14 00:49:36 UTC (rev 72145)
@@ -86,14 +86,18 @@
             AbstractContainer<?, ?> container = AbstractContainer.getContainer(advisor);
             List<Class<?>> interceptorClasses = container.getInterceptorRegistry().getApplicableInterceptorClasses(method);
             List<Interceptor> interceptors = new ArrayList<Interceptor>();
-            for(Class<?> interceptorClass : interceptorClasses)
+            if (interceptorClasses != null)
             {
-               ExtendedAdvisor interceptorAdvisor = ExtendedAdvisorHelper.getExtendedAdvisor(advisor);
-               for(Method interceptorMethod : ClassHelper.getAllMethods(interceptorClass))
+               for (Class<?> interceptorClass : interceptorClasses)
                {
-                  if(interceptorAdvisor.isAnnotationPresent(interceptorClass, interceptorMethod, AroundInvoke.class))
+                  ExtendedAdvisor interceptorAdvisor = ExtendedAdvisorHelper.getExtendedAdvisor(advisor);
+                  for (Method interceptorMethod : ClassHelper.getAllMethods(interceptorClass))
                   {
-                     interceptors.add(new EJB3InterceptorInterceptor(interceptorClass, interceptorMethod));
+                     if (interceptorAdvisor
+                           .isAnnotationPresent(interceptorClass, interceptorMethod, AroundInvoke.class))
+                     {
+                        interceptors.add(new EJB3InterceptorInterceptor(interceptorClass, interceptorMethod));
+                     }
                   }
                }
             }