[jboss-cvs] JBossAS SVN: r62142 - branches/Branch_5_0/server/src/main/org/jboss/ejb/deployers.

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

Author: scott.stark at jboss.org
Date: 2007-04-05 13:41:01 -0400 (Thu, 05 Apr 2007)
New Revision: 62142

Modified:
   branches/Branch_5_0/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
Log:
Cleanup duplicate invoker depends and workaround default invoker, JBAS-4306

Modified: branches/Branch_5_0/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
===================================================================
--- branches/Branch_5_0/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2007-04-05 17:38:42 UTC (rev 62141)
+++ branches/Branch_5_0/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2007-04-05 17:41:01 UTC (rev 62142)
@@ -179,7 +179,7 @@
       
       //Add a dependence on the jacc policy 
       //TODO: Do it only if the deployment is security enabled
-      JaccPolicyUtil.getServiceAttributeMetaData(unit, attrs); 
+      //JaccPolicyUtil.getServiceAttributeMetaData(unit, attrs); 
       ejbModule.setAttributes(attrs);
 
       List<ServiceDependencyMetaData> dependencies = new ArrayList<ServiceDependencyMetaData>();
@@ -201,23 +201,29 @@
       }
       // Add dependencies on the invoker services in use
       Iterator beans = deployment.getEnterpriseBeans();
-      HashSet<String> configNames = new HashSet<String>();
+      HashSet<String> invokerNames = new HashSet<String>();
       while( beans.hasNext() )
       {
          BeanMetaData bmd = (BeanMetaData) beans.next();
-         configNames.add(bmd.getConfigurationName());
-      }
-
-      for(String name : configNames)
-      {
-         ConfigurationMetaData cmd = deployment.getConfigurationMetaDataByName(name);
+         String configName = bmd.getConfigurationName();
+         ConfigurationMetaData cmd = deployment.getConfigurationMetaDataByName(configName);
          String[] invokers = cmd.getInvokers();
          for(String iname : invokers)
          {
-            ServiceDependencyMetaData invoker = new ServiceDependencyMetaData();
             InvokerProxyBindingMetaData imd = deployment.getInvokerProxyBindingMetaDataByName(iname);
-            invoker.setIDependOn(imd.getInvokerMBean());
-            dependencies.add(invoker);
+            String invokerName = imd.getInvokerMBean();
+            if( invokerName.equalsIgnoreCase("default") )
+            {
+               // TODO: JBAS-4306 hack to ingore the invalid default invoker-mbean
+               continue;
+            }
+            if( invokerNames.contains(invokerName) == false )
+            {
+               invokerNames.add(invokerName);
+               ServiceDependencyMetaData invoker = new ServiceDependencyMetaData();
+               invoker.setIDependOn(invokerName);
+               dependencies.add(invoker);
+            }
          }
       }
       // Add any declared dependencies