Author: cdouglas
Date: Fri May  9 15:49:01 2008
New Revision: 654973

URL: http://svn.apache.org/viewvc?rev=654973&view=rev
Log:
HADOOP-3371. Ignore InstanceAlreadyExistsException from
MBeanUtil::registerMBean. Contributed by lohit vijayarenu.


Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/java/org/apache/hadoop/metrics/util/MBeanUtil.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=654973&r1=654972&r2=654973&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri May  9 15:49:01 2008
@@ -214,6 +214,9 @@
     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

Modified: hadoop/core/trunk/src/java/org/apache/hadoop/metrics/util/MBeanUtil.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/java/org/apache/hadoop/metrics/util/MBeanUtil.java?rev=654973&r1=654972&r2=654973&view=diff
==============================================================================
--- hadoop/core/trunk/src/java/org/apache/hadoop/metrics/util/MBeanUtil.java (original)
+++ hadoop/core/trunk/src/java/org/apache/hadoop/metrics/util/MBeanUtil.java Fri May  9 15:49:01 2008
@@ -23,6 +23,7 @@
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
+import javax.management.InstanceAlreadyExistsException;
 
 
 /**
@@ -51,6 +52,8 @@
     try {
       mbs.registerMBean(theMbean, name);
       return name;
+    } catch (InstanceAlreadyExistsException ie) {
+      // Ignore if instance already exists 
     } catch (Exception e) {
       e.printStackTrace();
     }