[jboss-cvs] JBossAS SVN: r58970 - trunk/server/src/main/org/jboss/ejb/deployers

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

Author: scott.stark at jboss.org
Date: 2006-12-10 22:39:11 -0500 (Sun, 10 Dec 2006)
New Revision: 58970

Modified:
   trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
Log:
The ccm dependency was being overwritten by the timer service dependency

Modified: trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2006-12-11 01:17:41 UTC (rev 58969)
+++ trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2006-12-11 03:39:11 UTC (rev 58970)
@@ -171,26 +171,24 @@
       attrs.add(ws);
       ejbModule.setAttributes(attrs);
 
+      List<ServiceDependencyMetaData> dependencies = new ArrayList<ServiceDependencyMetaData>();
       // CCM for CachedConnectionInterceptor dependency
       // TODO: this should be injected directly to the interceptor
       if( ccmServiceName != null && ccmServiceName.length() > 0 )
       {
-         List<ServiceDependencyMetaData> dependencies = new ArrayList<ServiceDependencyMetaData>();
          ServiceDependencyMetaData ccm = new ServiceDependencyMetaData();
          ccm.setIDependOn(ccmServiceName);
          dependencies.add(ccm);
-         ejbModule.setDependencies(dependencies);
       }
       // Dependency on the timer service
       // TODO: this should be injected directly to the ejb container
       if( timerServiceName != null && timerServiceName.length() > 0 )
       {
-         List<ServiceDependencyMetaData> dependencies = new ArrayList<ServiceDependencyMetaData>();
-         ServiceDependencyMetaData ccm = new ServiceDependencyMetaData();
-         ccm.setIDependOn(timerServiceName);
-         dependencies.add(ccm);
-         ejbModule.setDependencies(dependencies);
+         ServiceDependencyMetaData tms = new ServiceDependencyMetaData();
+         tms.setIDependOn(timerServiceName);
+         dependencies.add(tms);
       }
+      ejbModule.setDependencies(dependencies);
 
       unit.addAttachment(ServiceMetaData.class, ejbModule);
    }