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

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

Author: ALRubinger
Date: 2008-05-07 16:44:08 -0400 (Wed, 07 May 2008)
New Revision: 73121

Modified:
   projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/InterceptorsFactory.java
Log:
[EJBTHREE-1339] Reverted NPE Fix from Revision 73094, should not be calling this code in the first place

Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/InterceptorsFactory.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/InterceptorsFactory.java	2008-05-07 19:00:24 UTC (rev 73120)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/InterceptorsFactory.java	2008-05-07 20:44:08 UTC (rev 73121)
@@ -278,21 +278,9 @@
       return (Map<Class<? extends Annotation>, List<Interceptor>>) instanceAdvisor.getMetaData().getMetaData(InterceptorsFactory.class, "lifeCycleInterceptors");
    }
    
-   public static List<Interceptor> getLifeCycleInterceptors(InstanceAdvisor instanceAdvisor,
-         Class<? extends Annotation> lifeCycleAnnotationClass)
+   public static List<Interceptor> getLifeCycleInterceptors(InstanceAdvisor instanceAdvisor, Class<? extends Annotation> lifeCycleAnnotationClass)
    {
-      // Obtain lifecycle interceptors
-      Map<Class<? extends Annotation>, List<Interceptor>> lifecycleInterceptors = getLifeCycleInterceptors(instanceAdvisor);
-
-      // If there are no lifecycle interceptors
-      if (lifecycleInterceptors == null)
-      {
-         // Return an empty list
-         return new ArrayList<Interceptor>();
-      }
-      
-      // Return the interceptors for this lifecycle annotation class
-      return lifecycleInterceptors.get(lifeCycleAnnotationClass);
+      return getLifeCycleInterceptors(instanceAdvisor).get(lifeCycleAnnotationClass);
    }
    
    /**