[jboss-cvs] JBossAS SVN: r69192 - trunk/cluster/src/main/org/jboss/proxy/generic.

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

Author: bstansberry at jboss.com
Date: 2008-01-22 10:29:30 -0500 (Tue, 22 Jan 2008)
New Revision: 69192

Modified:
   trunk/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHA.java
Log:
[JBAS-5164] Unregister DRM listener before destroying HATarget

Modified: trunk/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHA.java
===================================================================
--- trunk/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHA.java	2008-01-22 15:28:33 UTC (rev 69191)
+++ trunk/cluster/src/main/org/jboss/proxy/generic/ProxyFactoryHA.java	2008-01-22 15:29:30 UTC (rev 69192)
@@ -134,6 +134,11 @@
    public void stopService() throws Exception
    {
       super.stopService();
+
+      // JBAS-5164.  Unregister the listener first, or when we destroy
+      // the target we will get a callback and rebind the proxy
+      if (drm != null)
+         drm.unregisterListener(replicantName, this);
       
       try
       {
@@ -145,8 +150,6 @@
       {
          // ignore.
       }
-      if (drm != null)
-         drm.unregisterListener(replicantName, this);
    }
 
    protected void destroyService() throws Exception