[jboss-cvs] JBossAS SVN: r61477 - trunk/server/src/main/org/jboss/ejb.

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

Author: scott.stark at jboss.org
Date: 2007-03-19 21:42:28 -0400 (Mon, 19 Mar 2007)
New Revision: 61477

Modified:
   trunk/server/src/main/org/jboss/ejb/EjbModule.java
Log:
Remove the metrics based interceptor checking and marc's confusion over the transaction type attribute

Modified: trunk/server/src/main/org/jboss/ejb/EjbModule.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EjbModule.java	2007-03-19 23:20:58 UTC (rev 61476)
+++ trunk/server/src/main/org/jboss/ejb/EjbModule.java	2007-03-20 01:42:28 UTC (rev 61477)
@@ -945,13 +945,8 @@
    /**
     * Given a container-interceptors element of a container-configuration,
     * add the indicated interceptors to the container depending on the container
-    * transcation type and metricsEnabled flag.
+    * transcation type.
     *
-    *
-    * @todo marcf: frankly the transaction type stuff makes no sense to me, we have externalized
-    * the container stack construction in jbossxml and I don't see why or why there would be a
-    * type missmatch on the transaction
-    *
     * @param container   the container instance to setup.
     * @param transType   one of the BMT, CMT or ANY constants.
     * @param element     the container-interceptors element from the
@@ -967,7 +962,7 @@
       String transTypeString = stringTransactionValue(transType);
       ClassLoader loader = container.getClassLoader();
       /* First build the container interceptor stack from interceptorElements
-         match transType and metricsEnabled values
+         match transType values
       */
       ArrayList istack = new ArrayList();
       while (interceptorElements != null && interceptorElements.hasNext())
@@ -976,31 +971,13 @@
          /* Check that the interceptor is configured for the transaction mode of the bean
             by comparing its 'transaction' attribute to the string representation
             of transType
-            FIXME: marcf, WHY???????
          */
          String transAttr = ielement.getAttribute("transaction");
          if (transAttr == null || transAttr.length() == 0)
             transAttr = ANY_VALUE;
          if (transAttr.equalsIgnoreCase(ANY_VALUE) || transAttr.equalsIgnoreCase(transTypeString))
-         {   // The transaction type matches the container bean trans type, check the metricsEnabled
-            String metricsAttr = ielement.getAttribute("metricsEnabled");
-            boolean metricsInterceptor = metricsAttr.equalsIgnoreCase("true");
-            try
-            {
-               boolean metricsEnabled = ((Boolean) server.getAttribute(EJBDeployerMBean.OBJECT_NAME,
-                                                                       "MetricsEnabled")).booleanValue();
-               if (metricsEnabled == false && metricsInterceptor == true)
-               {
-                  continue;
-               }
-            }
-            catch (Exception e)
-            {
-               //throw new DeploymentException("couldn't contace EJBDeployer!", e);
-               log.debug("Couldn't get MetricsEnabled from EJBDeployer: " + e.getMessage());
-            } // end of try-catch
+         {   // The transaction type matches the container bean trans type
 
-
             String className = null;
             try
             {