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

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

Author: ALRubinger
Date: 2008-10-08 02:36:29 -0400 (Wed, 08 Oct 2008)
New Revision: 79259

Modified:
   projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java
Log:
[EJBTHREE-1515] Unbind @RemoteBinding.jndiBinding entries

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-10-08 06:35:55 UTC (rev 79258)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java	2008-10-08 06:36:29 UTC (rev 79259)
@@ -531,6 +531,20 @@
          log.debug("Default Remote Business View for EJB " + smd.getEjbName() + " to be unbound from JNDI at \""
                + defaultRemoteAddress + "\"");
          this.unbind(context, defaultRemoteAddress);
+         
+         // Unbind all @RemoteBinding.jndiBindings
+         List<RemoteBindingMetaData> remoteBindings = smd.getRemoteBindings();
+         if (remoteBindings != null)
+         {
+            for (RemoteBindingMetaData remoteBinding : remoteBindings)
+            {
+               String remoteBindingJndiName = remoteBinding.getJndiName();
+               if (remoteBindingJndiName != null && remoteBindingJndiName.trim().length() > 0)
+               {
+                  this.unbind(context, remoteBindingJndiName);
+               }
+            }
+         }
 
          // Unbind ObjectFactory specific to each Remote Business Interface
          if (businessRemotes != null)