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

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

Author: ALRubinger
Date: 2008-08-27 05:22:07 -0400 (Wed, 27 Aug 2008)
New Revision: 77522

Modified:
   projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java
Log:
[EJBTHREE-1473] Deregister Proxy Factory w/ AOP Dispatcher upon undeploy

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-27 08:20:39 UTC (rev 77521)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/JndiSessionRegistrarBase.java	2008-08-27 09:22:07 UTC (rev 77522)
@@ -34,6 +34,7 @@
 import javax.naming.spi.ObjectFactory;
 
 import org.jboss.aop.Advisor;
+import org.jboss.aop.Dispatcher;
 import org.jboss.ejb3.common.registrar.spi.DuplicateBindException;
 import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
 import org.jboss.ejb3.common.string.StringUtils;
@@ -939,6 +940,17 @@
 
       // Deregister
       Ejb3RegistrarLocator.locateRegistrar().unbind(name);
+      
+      // EJBTHREE-1473
+      // Deregister with AOP if registered
+      //TODO This should probably be in a cleaner location, ie.
+      // implement a callback for AOP Registration/Deregistration
+      // that decouples JNDI Registration and abstracts whether 
+      // a Proxy Factory is Remote or not
+      if(Dispatcher.singleton.isRegistered(name))
+      {
+         Dispatcher.singleton.unregisterTarget(name);
+      }
    }
 
    // --------------------------------------------------------------------------------||