[jboss-cvs] JBossAS SVN: r69342 - 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:11:00 -0500 (Fri, 25 Jan 2008)
New Revision: 69342

Modified:
   projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/EnvironmentInterceptorMetaDataBridge.java
Log:
Allow for inherited interceptors

Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/EnvironmentInterceptorMetaDataBridge.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/EnvironmentInterceptorMetaDataBridge.java	2008-01-25 10:30:26 UTC (rev 69341)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/metadata/EnvironmentInterceptorMetaDataBridge.java	2008-01-25 11:11:00 UTC (rev 69342)
@@ -33,8 +33,10 @@
 import org.jboss.ejb3.interceptors.annotation.impl.PreDestroyImpl;
 import org.jboss.ejb3.metadata.MetaDataBridge;
 import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.spec.AroundInvokeMetaData;
 import org.jboss.metadata.ejb.spec.AroundInvokesMetaData;
 import org.jboss.metadata.javaee.spec.Environment;
+import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
 import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
 
 /**
@@ -68,10 +70,13 @@
       if(callbacks == null || callbacks.isEmpty())
          return null;
       
-      assert callbacks.size() == 1;
-      String callbackMethodName = callbacks.get(0).getMethodName();
-      if(methodName.equals(callbackMethodName))
-         return new AroundInvokeImpl();
+      for(AroundInvokeMetaData callback : callbacks)
+      {
+         // TODO: callback.classname
+         String callbackMethodName = callback.getMethodName();
+         if(methodName.equals(callbackMethodName))
+            return new AroundInvokeImpl();
+      }
       return null;
    }
    
@@ -80,11 +85,13 @@
       if(callbacks == null || callbacks.isEmpty())
          return null;
       
-      assert callbacks.size() == 1;
-      // TODO: callbacks[0].className
-      String callbackMethodName = callbacks.get(0).getMethodName();
-      if(methodName.equals(callbackMethodName))
-         return createAnnotationImpl(annotationImplType);
+      for(LifecycleCallbackMetaData callback : callbacks)
+      {
+         // TODO: callback.className
+         String callbackMethodName = callback.getMethodName();
+         if(methodName.equals(callbackMethodName))
+            return createAnnotationImpl(annotationImplType);
+      }
       return null;
    }