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

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

Author: ALRubinger
Date: 2008-07-26 16:40:08 -0400 (Sat, 26 Jul 2008)
New Revision: 76246

Modified:
   projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/InterceptorComponentMetaDataLoaderFactory.java
Log:
Bug fix (NPE) in interceptors

Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/InterceptorComponentMetaDataLoaderFactory.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/InterceptorComponentMetaDataLoaderFactory.java	2008-07-26 12:46:24 UTC (rev 76245)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/InterceptorComponentMetaDataLoaderFactory.java	2008-07-26 20:40:08 UTC (rev 76246)
@@ -39,7 +39,7 @@
  * Comment
  *
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
  */
 public class InterceptorComponentMetaDataLoaderFactory implements ComponentMetaDataLoaderFactory<JBossEnterpriseBeanMetaData>
 {
@@ -68,10 +68,13 @@
    private InterceptorMetaData findInterceptor(JBossEnterpriseBeanMetaData beanMetaData, String name)
    {
       InterceptorsMetaData interceptors = beanMetaData.getEjbJarMetaData().getInterceptors();
-      for(InterceptorMetaData interceptorMetaData : interceptors)
+      if (interceptors != null)
       {
-         if(interceptorMetaData.getInterceptorClass().equals(name))
-            return interceptorMetaData;
+         for (InterceptorMetaData interceptorMetaData : interceptors)
+         {
+            if (interceptorMetaData.getInterceptorClass().equals(name))
+               return interceptorMetaData;
+         }
       }
       return null;
    }