Author: fhanik
Date: Wed Aug 8 19:06:32 2007
New Revision: 564074
URL: http://svn.apache.org/viewvc?view=rev&rev=564074
Log:
remove throwing of exceptions, handle everything inside the JMX helper
Modified:
tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java?view=diff&rev=564074&r1=564073&r2=564074
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java Wed Aug
8 19:06:32 2007
@@ -100,12 +100,17 @@
}
}
- public static boolean unregisterDefaultCluster(SimpleTcpCluster cluster)
throws Exception {
- ObjectName clusterName = getDefaultClusterName(cluster);
- if (getMBeanServer().isRegistered(clusterName)) {
- getMBeanServer().unregisterMBean(clusterName);
+ public static boolean unregisterDefaultCluster(SimpleTcpCluster cluster) {
+ try {
+ ObjectName clusterName = getDefaultClusterName(cluster);
+ if (getMBeanServer().isRegistered(clusterName)) {
+ getMBeanServer().unregisterMBean(clusterName);
+ }
+ return true;
+ }catch ( Exception x ) {
+ log.warn("Unable to unregister default cluster implementation with
JMX",x);
+ return false;
}
- return true;
}
private static ObjectName getDefaultClusterName(SimpleTcpCluster cluster)
throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
