# HG changeset patch # User amurillo # Date 1445905153 25200 # Node ID 3d71824cad308c20fd36692abfef238dc1656f86 # Parent b606aa2b32d18526132f898c6644beeaf3e53c6e# Parent d57f43a33894b351dd82dc7f095d9d5e22fabef7 Merge diff -r b606aa2b32d1 -r 3d71824cad30 jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java diff -r b606aa2b32d1 -r 3d71824cad30 jdk/src/java.management/share/classes/javax/management/MXBean.java diff -r b606aa2b32d1 -r 3d71824cad30 jdk/test/javax/management/Introspector/AnnotationSecurityTest.java diff -r b606aa2b32d1 -r 3d71824cad30 jdk/test/javax/management/Introspector/Described.java diff -r b606aa2b32d1 -r 3d71824cad30 jdk/test/javax/management/Introspector/DescribedMX.java diff -r b606aa2b32d1 -r 3d71824cad30 jdk/test/javax/management/mxbean/AmbiguousConstructorTest.java diff -r b606aa2b32d1 -r 3d71824cad30 jdk/test/javax/management/mxbean/ExceptionDiagnosisTest.java diff -r b606aa2b32d1 -r 3d71824cad30 jdk/test/javax/management/mxbean/LeakTest.java diff -r b606aa2b32d1 -r 3d71824cad30 jdk/test/javax/management/mxbean/MXBeanTest.java diff -r b606aa2b32d1 -r 3d71824cad30 jdk/test/javax/management/mxbean/PropertyNamesTest.java diff -r b606aa2b32d1 -r 3d71824cad30 jdk/test/javax/management/mxbean/TigerMXBean.java