[jboss-cvs] JBossAS SVN: r85796 - projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata.

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

Author: petemuir
Date: 2009-03-12 19:38:10 -0400 (Thu, 12 Mar 2009)
New Revision: 85796

Modified:
   projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
Log:
WBINT-6

Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java	2009-03-12 22:25:15 UTC (rev 85795)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java	2009-03-12 23:38:10 UTC (rev 85796)
@@ -98,6 +98,20 @@
          interceptorBindings = new InterceptorBindingsMetaData();
          assemblyDescriptor.setInterceptorBindings(interceptorBindings);
       }
-      interceptorBindings.add(IBMD); // clone?
+      // Add this as the first binding in the list so that it is called first...
+      interceptorBindings.add(0, IBMD); // clone?
+      
+      // Check to see there is a defined order; if we aren't first, warn
+      for (InterceptorBindingMetaData interceptorBinding : interceptorBindings)
+      {
+         if (interceptorBinding.getInterceptorOrder() != null && ! interceptorBinding.getInterceptorOrder().isEmpty())
+         {
+            if (!INTERCEPTOR_CLASS_NAME.equals(interceptorBinding.getInterceptorOrder().iterator().next()))
+            {
+               log.warn("The Web Beans SessionnBeanInterceptor is not the inner most EJB interceptor in this deployment. JSR299 injection may not work correctly. Specify " + INTERCEPTOR_CLASS_NAME + " as the first interceptor in the interceptor ordering for " + interceptorBinding.getEjbName());
+            }
+            // TODO automagically make ours the first?
+         }
+      }
    }
 }
\ No newline at end of file