[jboss-cvs] JBossAS SVN: r74075 - projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar.

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

Author: ALRubinger
Date: 2008-06-04 00:37:28 -0400 (Wed, 04 Jun 2008)
New Revision: 74075

Modified:
   projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java
Log:
[EJBTHREE-1398] Fixes for EJB2.x Only View Tests, now passing

Modified: projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java
===================================================================
--- projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java	2008-06-04 04:35:21 UTC (rev 74074)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java	2008-06-04 04:37:28 UTC (rev 74075)
@@ -297,11 +297,14 @@
          List<RefAddr> refAddrsForDefaultLocal = new ArrayList<RefAddr>();
 
          // For each of the local business interfaces, make a Reference Address
-         for (String businessLocal : businessLocals)
+         if (businessLocals != null)
          {
-            RefAddr refAddr = new StringRefAddr(
-                  ProxyFactoryReferenceAddressTypes.REF_ADDR_TYPE_PROXY_BUSINESS_INTERFACE_LOCAL, businessLocal);
-            refAddrsForDefaultLocal.add(refAddr);
+            for (String businessLocal : businessLocals)
+            {
+               RefAddr refAddr = new StringRefAddr(
+                     ProxyFactoryReferenceAddressTypes.REF_ADDR_TYPE_PROXY_BUSINESS_INTERFACE_LOCAL, businessLocal);
+               refAddrsForDefaultLocal.add(refAddr);
+            }
          }
 
          // Determine if local home and business locals are bound to same JNDI Address
@@ -355,18 +358,21 @@
          this.bind(defaultLocalRef, defaultLocalAddress, localProxyFactoryKey, containerName);
 
          // Bind ObjectFactory specific to each Local Business Interface
-         for (String businessLocal : businessLocals)
+         if (businessLocals != null)
          {
-            RefAddr refAddr = new StringRefAddr(
-                  ProxyFactoryReferenceAddressTypes.REF_ADDR_TYPE_PROXY_BUSINESS_INTERFACE_LOCAL, businessLocal);
-            Reference ref = new Reference(JndiSessionRegistrarBase.OBJECT_FACTORY_CLASSNAME_PREFIX + businessLocal,
-                  this.getSessionProxyObjectFactoryType(), null);
-            ref.add(refAddr);
-            String address = smd.determineResolvedJndiName(businessLocal);
-            log.debug("Local Business View for " + businessLocal + " of EJB " + smd.getEjbName()
-                  + " to be bound into JNDI at \"" + address + "\"");
-            this.bind(ref, address, localProxyFactoryKey, containerName);
+            for (String businessLocal : businessLocals)
+            {
+               RefAddr refAddr = new StringRefAddr(
+                     ProxyFactoryReferenceAddressTypes.REF_ADDR_TYPE_PROXY_BUSINESS_INTERFACE_LOCAL, businessLocal);
+               Reference ref = new Reference(JndiSessionRegistrarBase.OBJECT_FACTORY_CLASSNAME_PREFIX + businessLocal,
+                     this.getSessionProxyObjectFactoryType(), null);
+               ref.add(refAddr);
+               String address = smd.determineResolvedJndiName(businessLocal);
+               log.debug("Local Business View for " + businessLocal + " of EJB " + smd.getEjbName()
+                     + " to be bound into JNDI at \"" + address + "\"");
+               this.bind(ref, address, localProxyFactoryKey, containerName);
 
+            }
          }
       }
    }