remove throwing of exceptions, handle everything inside the JMX helper

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@564074 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java b/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java
index 0e559ae..93365d7 100644 (file)
--- a/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java
+++ b/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java
@@ -100,12 +100,17 @@ public class ClusterJmxHelper {
         }\r
     }\r
 \r
-    public static boolean unregisterDefaultCluster(SimpleTcpCluster cluster) throws Exception {\r
-        ObjectName clusterName = getDefaultClusterName(cluster);\r
-        if (getMBeanServer().isRegistered(clusterName)) {\r
-            getMBeanServer().unregisterMBean(clusterName);\r
+    public static boolean unregisterDefaultCluster(SimpleTcpCluster cluster) {\r
+        try {\r
+            ObjectName clusterName = getDefaultClusterName(cluster);\r
+            if (getMBeanServer().isRegistered(clusterName)) {\r
+                getMBeanServer().unregisterMBean(clusterName);\r
+            }\r
+            return true;\r
+        }catch ( Exception x ) {\r
+            log.warn("Unable to unregister default cluster implementation with JMX",x);\r
+            return false;\r
         }\r
-        return true;\r
     }\r
 \r
     private static ObjectName getDefaultClusterName(SimpleTcpCluster cluster) throws Exception {\r