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

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

Author: jerrygauth
Date: 2007-07-19 09:52:31 -0400 (Thu, 19 Jul 2007)
New Revision: 64136

Modified:
   trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
Log:
JBAS-4569, ClusterService.stopService( ) fails on server shutdown

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java	2007-07-19 13:34:34 UTC (rev 64135)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java	2007-07-19 13:52:31 UTC (rev 64136)
@@ -387,7 +387,7 @@
          }
          catch (Exception e)
          {
-            log.error("operation failed", e);
+            log.error("ReplicantManager stop operation failed", e);
          }
       }      
 
@@ -399,20 +399,26 @@
       }
       catch (Exception e)
       {
-         log.error("operation failed", e);
+         log.error("channel disconnection failed", e);
       }
 
       if (bindIntoJndi)
       {
          String boundName = "/HAPartition/" + getPartitionName();
-         InitialContext ctx = new InitialContext();
+         InitialContext ctx = null;
          try
          {
+            // the following statement fails when the server is being shut down (07/19/2007)
+            ctx = new InitialContext();
             ctx.unbind(boundName);
          }
+         catch (Exception e) {
+            log.warn("partition unbind operation failed: " + e.toString());
+         }
          finally
          {
-            ctx.close();
+            if (ctx != null)
+               ctx.close();
          }
          NonSerializableFactory.unbind (boundName);         
       }