[jboss-cvs] JBossAS SVN: r60770 - in branches/Branch_4_2/server/src/main/org/jboss: ejb and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2007-02-21 11:12:49 -0500 (Wed, 21 Feb 2007)
New Revision: 60770

Modified:
   branches/Branch_4_2/server/src/main/org/jboss/deployment/ClientDeployer.java
   branches/Branch_4_2/server/src/main/org/jboss/ejb/Container.java
   branches/Branch_4_2/server/src/main/org/jboss/web/AbstractWebDeployer.java
Log:
Conditionally delegate to ServiceRefHandler

Modified: branches/Branch_4_2/server/src/main/org/jboss/deployment/ClientDeployer.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/deployment/ClientDeployer.java	2007-02-21 15:56:50 UTC (rev 60769)
+++ branches/Branch_4_2/server/src/main/org/jboss/deployment/ClientDeployer.java	2007-02-21 16:12:49 UTC (rev 60770)
@@ -271,7 +271,8 @@
       // Bind service references
       Iterator serviceRefs = metaData.getServiceReferences().values().iterator();
       ServiceRefHandler serviceRefHandler = ServiceRefHandlerFactory.newInstance();
-      serviceRefHandler.bindServiceRefs(envCtx, serviceRefs, di);
+      if (serviceRefHandler != null)
+         serviceRefHandler.bindServiceRefs(envCtx, serviceRefs, di);
       
       // Bind resource references
       HashMap resRefs = metaData.getResourceReferences();

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/Container.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/Container.java	2007-02-21 15:56:50 UTC (rev 60769)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/Container.java	2007-02-21 16:12:49 UTC (rev 60770)
@@ -1236,8 +1236,9 @@
 
       // Bind service references
       Iterator serviceRefs = metaData.getServiceReferences().values().iterator();
-      //ServiceRefHandler serviceRefHandler = ServiceRefHandlerFactory.newInstance();
-      //serviceRefHandler.bindServiceRefs(envCtx, serviceRefs, di);
+      ServiceRefHandler serviceRefHandler = ServiceRefHandlerFactory.newInstance();
+      if (serviceRefHandler != null)
+         serviceRefHandler.bindServiceRefs(envCtx, serviceRefs, di);
 
       // Bind resource references
       {

Modified: branches/Branch_4_2/server/src/main/org/jboss/web/AbstractWebDeployer.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/web/AbstractWebDeployer.java	2007-02-21 15:56:50 UTC (rev 60769)
+++ branches/Branch_4_2/server/src/main/org/jboss/web/AbstractWebDeployer.java	2007-02-21 16:12:49 UTC (rev 60770)
@@ -517,8 +517,9 @@
       linkEjbLocalRefs(ejbLocalRefs, envCtx, di);
       Iterator serviceRefs = metaData.getServiceReferences();
       log.debug("linkServiceRefs");
-      //ServiceRefHandler serviceRefHandler = ServiceRefHandlerFactory.newInstance();
-      //serviceRefHandler.bindServiceRefs(envCtx, serviceRefs, di);
+      ServiceRefHandler serviceRefHandler = ServiceRefHandlerFactory.newInstance();
+      if (serviceRefHandler != null)
+         serviceRefHandler.bindServiceRefs(envCtx, serviceRefs, di);
       String securityDomain = metaData.getSecurityDomain();
       log.debug("linkSecurityDomain");
       linkSecurityDomain(securityDomain, envCtx);