test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java

@@ -21,21 +21,23 @@
  * questions.
  */
 
 /*
  * @test
- * @bug     6876135
+ * @bug     6876135 7024172
  *
  * @summary Test PlatformLoggingMXBean
- *          This test performs similar testing as LoggingMXBeanTest.
+ *          This test performs similar testing as 
+ *          java/util/logging/LoggingMXBeanTest.
  *
  * @build PlatformLoggingMXBeanTest
  * @run main PlatformLoggingMXBeanTest
  */
 
 import javax.management.*;
 import java.lang.management.ManagementFactory;
+import java.lang.management.PlatformLoggingMXBean;
 import java.util.logging.*;
 import java.util.List;
 
 public class PlatformLoggingMXBeanTest
 {

@@ -245,31 +247,26 @@
         System.out.println( "***************** All Tests Passed ****************" );
         System.out.println( "***************************************************" );
     }
 
     public static void main(String[] argv) throws Exception {
-        List<PlatformLoggingMXBean> result =
-            ManagementFactory.getPlatformMXBeans(PlatformLoggingMXBean.class);
-        if (result.size() != 1) {
-            throw new RuntimeException("Unexpected number of PlatformLoggingMXBean instances: " +
-                result.size());
-        }
-
-        PlatformLoggingMXBean mbean = result.get(0);
+        PlatformLoggingMXBean mbean =
+            ManagementFactory.getPlatformMXBean(PlatformLoggingMXBean.class);
         ObjectName objname = mbean.getObjectName();
         if (!objname.equals(new ObjectName(LogManager.LOGGING_MXBEAN_NAME))) {
             throw new RuntimeException("Invalid ObjectName " + objname);
         }
 
         // check if the PlatformLoggingMXBean is registered in the platform MBeanServer
         MBeanServer platformMBS = ManagementFactory.getPlatformMBeanServer();
         ObjectName objName = new ObjectName(LogManager.LOGGING_MXBEAN_NAME);
+
         // We could call mbs.isRegistered(objName) here.
         // Calling getMBeanInfo will throw exception if not found.
         platformMBS.getMBeanInfo(objName);
 
-        if (!platformMBS.isInstanceOf(objName, "java.util.logging.PlatformLoggingMXBean") ||
+        if (!platformMBS.isInstanceOf(objName, "java.lang.management.PlatformLoggingMXBean") ||
             !platformMBS.isInstanceOf(objName, "java.util.logging.LoggingMXBean")) {
             throw new RuntimeException(objName + " is of unexpected type");
         }
 
         // test if PlatformLoggingMXBean works properly in a MBeanServer