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

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

Author: ALRubinger
Date: 2008-08-07 02:05:15 -0400 (Thu, 07 Aug 2008)
New Revision: 76747

Modified:
   projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java
Log:
[EJBTHREE-1345] Ensure that LocalHome or RemoteHome is defined in boundTogether check, not just the JNDI Names

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-08-07 06:04:20 UTC (rev 76746)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java	2008-08-07 06:05:15 UTC (rev 76747)
@@ -218,8 +218,10 @@
          if (bindRemoteAndHomeTogether)
          {
             // Add a Reference Address for the Remote Home
+            String home = smd.getHome();
+            assert home != null : "Home and Business set to be bound together, yet no home is defined";
             RefAddr refAddr = new StringRefAddr(
-                  ProxyFactoryReferenceAddressTypes.REF_ADDR_TYPE_PROXY_EJB2x_INTERFACE_HOME_REMOTE, smd.getHome());
+                  ProxyFactoryReferenceAddressTypes.REF_ADDR_TYPE_PROXY_EJB2x_INTERFACE_HOME_REMOTE, home);
             refAddrsForDefaultRemote.add(refAddr);
          }
          // Bind Home (not bound together) if exists
@@ -621,12 +623,25 @@
       // If local
       if (isLocal)
       {
+         // If no local home defined
+         if (smd.getLocalHome() == null)
+         {
+            // Not bound together
+            return false;
+         }
+
          // Bind together if Local Default JNDI Name == Local Home JNDI Name
          bindTogether = smd.getLocalJndiName().equals(smd.getLocalHomeJndiName());
       }
       // If Remote
       else
       {
+         // If no home defined
+         if (smd.getHome() == null)
+         {
+            // Not bound together
+            return false;
+         }
          // Bind together if Local Default JNDI Name == Local Home JNDI Name
          bindTogether = smd.getJndiName().equals(smd.getHomeJndiName());
       }