[jboss-cvs] JBossAS SVN: r73308 - trunk/cluster/src/main/org/jboss/ha/framework/server.

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

Author: bstansberry at jboss.com
Date: 2008-05-12 12:27:37 -0400 (Mon, 12 May 2008)
New Revision: 73308

Modified:
   trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
Log:
Improve shutdown order of channels

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java	2008-05-12 15:37:12 UTC (rev 73307)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java	2008-05-12 16:27:37 UTC (rev 73308)
@@ -60,8 +60,8 @@
 import org.jboss.util.threadpool.ThreadPool;
 import org.jgroups.Channel;
 import org.jgroups.ChannelFactory;
+import org.jgroups.ExtendedMembershipListener;
 import org.jgroups.ExtendedMessageListener;
-import org.jgroups.ExtendedMembershipListener;
 import org.jgroups.MembershipListener;
 import org.jgroups.MergeView;
 import org.jgroups.Message;
@@ -410,25 +410,25 @@
 
       replicantManager.stopService();
       
-//    NR 200505 : [JBCLUSTER-38] replace channel.close() by a disconnect and
-//    add the destroyPartition() step
       try
       {
-         if (channel != null && channel.isConnected())
-            channel.disconnect();
+         cacheManager.releaseCache(cacheConfigName);
       }
       catch (Exception e)
       {
-         log.error("channel disconnection failed", e);
+         log.error("cache release failed", e);
       }
       
+//    NR 200505 : [JBCLUSTER-38] replace channel.close() by a disconnect and
+//    add the destroyPartition() step
       try
       {
-         cacheManager.releaseCache(cacheConfigName);
+         if (channel != null && channel.isConnected())
+            channel.disconnect();
       }
       catch (Exception e)
       {
-         log.error("cache release failed", e);
+         log.error("channel disconnection failed", e);
       }
 
       if (bindIntoJndi)