HADOOP-3371. Ignore InstanceAlreadyExistsException from

MBeanUtil::registerMBean. Contributed by lohit vijayarenu.



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

CHANGES.txt

@@ -214,6 +214,9 @@ Trunk (unreleased changes)
     HADOOP-3348. TestUrlStreamHandler should set URLStreamFactory after
     DataNodes are initialized. (Lohit Vijayarenu via rangadi)
 
+    HADOOP-3371. Ignore InstanceAlreadyExistsException from
+    MBeanUtil::registerMBean. (lohit vijayarenu via cdouglas)
+
 Release 0.17.0 - Unreleased
 
   INCOMPATIBLE CHANGES

src/java/org/apache/hadoop/metrics/util/MBeanUtil.java

@@ -23,6 +23,7 @@ import javax.management.InstanceNotFoundException;
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
+import javax.management.InstanceAlreadyExistsException;
 
 
 /**
@@ -51,6 +52,8 @@ public class MBeanUtil {
     try {
       mbs.registerMBean(theMbean, name);
       return name;
+    } catch (InstanceAlreadyExistsException ie) {
+      // Ignore if instance already exists 
     } catch (Exception e) {
       e.printStackTrace();
     }