hg: jdk9/sandbox/jdk: Merge
james.laskey at oracle.com
james.laskey at oracle.com
Thu May 21 19:03:05 UTC 2015
Changeset: a53f1851b2c3
Author: jlaskey
Date: 2015-05-21 15:46 -0300
URL: http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/a53f1851b2c3
Merge
- src/java.base/share/classes/sun/security/provider/certpath/CertStoreHelper.java
- src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStoreHelper.java
! src/java.base/share/native/include/jvm.h
- src/java.desktop/unix/classes/sun/awt/motif/MFontConfiguration.java
- src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643.java
- src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P1.java
- src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P2.java
- src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P3.java
- src/java.desktop/unix/classes/sun/awt/motif/X11Dingbats.java
- src/java.desktop/unix/classes/sun/awt/motif/X11GB18030_0.java
- src/java.desktop/unix/classes/sun/awt/motif/X11GB18030_1.java
- src/java.desktop/unix/classes/sun/awt/motif/X11GB2312.java
- src/java.desktop/unix/classes/sun/awt/motif/X11GBK.java
- src/java.desktop/unix/classes/sun/awt/motif/X11JIS0201.java
- src/java.desktop/unix/classes/sun/awt/motif/X11JIS0208.java
- src/java.desktop/unix/classes/sun/awt/motif/X11JIS0212.java
- src/java.desktop/unix/classes/sun/awt/motif/X11Johab.java
- src/java.desktop/unix/classes/sun/awt/motif/X11KSC5601.java
- src/java.desktop/unix/classes/sun/awt/motif/X11SunUnicode_0.java
- src/java.management/share/classes/META-INF/services/sun.management.spi.PlatformMBeanProvider
- src/java.management/share/classes/com/sun/management/DiagnosticCommandMBean.java
- src/java.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java
- src/java.management/share/classes/com/sun/management/GarbageCollectorMXBean.java
- src/java.management/share/classes/com/sun/management/GcInfo.java
- src/java.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
- src/java.management/share/classes/com/sun/management/OperatingSystemMXBean.java
- src/java.management/share/classes/com/sun/management/ThreadMXBean.java
- src/java.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java
- src/java.management/share/classes/com/sun/management/VMOption.java
- src/java.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java
- src/java.management/share/classes/com/sun/management/package-info.java
- src/java.management/share/classes/sun/management/DiagnosticCommandArgumentInfo.java
- src/java.management/share/classes/sun/management/DiagnosticCommandImpl.java
- src/java.management/share/classes/sun/management/DiagnosticCommandInfo.java
- src/java.management/share/classes/sun/management/Flag.java
- src/java.management/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java
- src/java.management/share/classes/sun/management/GcInfoBuilder.java
- src/java.management/share/classes/sun/management/GcInfoCompositeData.java
- src/java.management/share/classes/sun/management/HotSpotDiagnostic.java
- src/java.management/share/classes/sun/management/ManagementFactory.java
- src/java.management/share/classes/sun/management/VMOptionCompositeData.java
- src/java.management/share/native/libmanagement/DiagnosticCommandImpl.c
- src/java.management/share/native/libmanagement/Flag.c
- src/java.management/share/native/libmanagement/GcInfoBuilder.c
- src/java.management/share/native/libmanagement/HotSpotDiagnostic.c
- src/java.management/unix/classes/sun/management/OperatingSystemImpl.java
- src/java.management/unix/native/libmanagement/LinuxOperatingSystem.c
- src/java.management/unix/native/libmanagement/MacosxOperatingSystem.c
- src/java.management/unix/native/libmanagement/OperatingSystemImpl.c
- src/java.management/unix/native/libmanagement/SolarisOperatingSystem.c
- src/java.management/windows/classes/sun/management/OperatingSystemImpl.java
- src/java.management/windows/native/libmanagement/OperatingSystemImpl.c
- src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/DoubleByteEncoder.java
- src/jdk.charsets/unix/classes/sun/nio/cs/ext/COMPOUND_TEXT.java
- src/jdk.charsets/unix/classes/sun/nio/cs/ext/COMPOUND_TEXT_Decoder.java
- src/jdk.charsets/unix/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java
- src/jdk.charsets/unix/classes/sun/nio/cs/ext/CompoundTextSupport.java
- src/jdk.dev/share/classes/com/sun/tools/hat/Main.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaByte.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaChar.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaClass.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaDouble.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaField.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaFloat.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaHeapObject.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaHeapObjectVisitor.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaInt.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaLong.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaObject.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaObjectArray.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaObjectRef.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaShort.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaStatic.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaThing.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaValue.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ReachableExcludes.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ReachableExcludesImpl.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ReachableObjects.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/ReferenceChain.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/Root.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/Snapshot.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/StackFrame.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/model/StackTrace.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/oql/OQLEngine.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/oql/OQLException.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/oql/OQLQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/oql/ObjectVisitor.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/FileReadBuffer.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/HprofReader.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/MappedReadBuffer.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/PositionDataInputStream.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/PositionInputStream.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/ReadBuffer.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/parser/Reader.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/AllRootsQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/FinalizerObjectsQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/FinalizerSummaryQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/HistogramQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/HttpReader.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/InstancesQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/PlatformClasses.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/QueryListener.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/ReachableQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/RootStackQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/server/RootsQuery.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/ArraySorter.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/Comparer.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/CompositeEnumeration.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/Misc.java
- src/jdk.dev/share/classes/com/sun/tools/hat/internal/util/VectorSorter.java
- src/jdk.dev/share/classes/com/sun/tools/hat/resources/hat.js
- src/jdk.dev/share/classes/com/sun/tools/hat/resources/oqlhelp.html
- src/jdk.dev/share/classes/com/sun/tools/hat/resources/platform_names.txt
- test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh
- test/java/awt/Component/isLightweightCrash/StubPeerCrash.java
- test/java/lang/management/ThreadMXBean/Semaphore.java
- test/sun/management/jmxremote/startstop/JMXStartStopDoSomething.java
- test/sun/nio/cs/OLD/X11GB2312_OLD.java
- test/sun/nio/cs/OLD/X11GBK_OLD.java
- test/sun/nio/cs/OLD/X11KSC5601_OLD.java
- test/sun/nio/cs/TestCompoundTest.java
- test/sun/nio/cs/TestX11CNS.java
- test/sun/nio/cs/TestX11JIS0201.java
- test/sun/nio/cs/X11CNS11643.java
- test/sun/nio/cs/X11CNS11643P1.java
- test/sun/nio/cs/X11CNS11643P2.java
- test/sun/nio/cs/X11CNS11643P3.java
- test/sun/tools/common/ApplicationSetup.sh
- test/sun/tools/common/CommonSetup.sh
- test/sun/tools/common/ShutdownSimpleApplication.java
- test/sun/tools/common/SimpleApplication.java
- test/sun/tools/common/SleeperApplication.java
- test/sun/tools/jhat/HatHeapDump1Test.java
- test/sun/tools/jhat/HelloWorld.java
- test/sun/tools/jhat/ParseTest.sh
- test/sun/tools/jhat/README.TXT
More information about the jdk9-sandbox-changes
mailing list