hg: jdk9/sandbox/jdk: Merging recent trunk/default changes into the JDK-8058150-branch branch

Tue Jun 16 07:55:14 UTC 2015

Changeset: 3f6a24d40b51
Author:    jlahoda
Date:      2015-06-16 08:37 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/3f6a24d40b51

Merging recent trunk/default changes into the JDK-8058150-branch branch

- make/gendata/Gendata-jdk.dev.gmk
- src/bsd/doc/man/ja/native2ascii.1
- src/bsd/doc/man/native2ascii.1
- src/java.base/share/classes/com/sun/java/util/jar/pack/package.html
- src/java.base/share/classes/com/sun/net/ssl/package.html
- src/java.base/share/classes/java/io/package.html
- src/java.base/share/classes/java/lang/ref/package.html
- src/java.base/share/classes/java/nio/channels/spi/package.html
- src/java.base/share/classes/java/nio/charset/package.html
- src/java.base/share/classes/java/nio/charset/spi/package.html
- src/java.base/share/classes/java/nio/package.html
- src/java.base/share/classes/java/text/package.html
- src/java.base/share/classes/java/text/spi/package.html
- src/java.base/share/classes/java/util/jar/package.html
- src/java.base/share/classes/java/util/package.html
- src/java.base/share/classes/java/util/regex/package.html
- src/java.base/share/classes/java/util/spi/package.html
- src/java.base/share/classes/javax/crypto/interfaces/package.html
- src/java.base/share/classes/javax/crypto/package.html
- src/java.base/share/classes/javax/crypto/spec/package.html
- src/java.base/share/classes/javax/net/package.html
- src/java.base/share/classes/javax/net/ssl/package.html
- src/java.base/share/classes/sun/misc/ExtensionDependency.java
- src/java.base/share/classes/sun/misc/ExtensionInfo.java
- src/java.base/share/classes/sun/misc/ExtensionInstallationException.java
- src/java.base/share/classes/sun/misc/ExtensionInstallationProvider.java
- src/java.base/share/classes/sun/misc/JavaBeansIntrospectorAccess.java
- src/java.base/share/classes/sun/nio/cs/AbstractCharsetProvider.java
- src/java.base/share/classes/sun/reflect/package.html
- src/java.base/share/classes/sun/security/ssl/EngineArgs.java
- src/java.base/share/classes/sun/security/ssl/EngineInputRecord.java
- src/java.base/share/classes/sun/security/ssl/EngineOutputRecord.java
- src/java.base/share/classes/sun/security/ssl/EngineWriter.java
- src/java.base/share/classes/sun/security/ssl/KerberosClientKeyExchange.java
- src/java.base/share/classes/sun/security/ssl/Krb5Helper.java
- src/java.base/share/classes/sun/security/ssl/Krb5Proxy.java
- src/java.security.jgss/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java
- src/java.security.jgss/share/classes/sun/security/ssl/krb5/KerberosPreMasterSecret.java
- src/java.security.jgss/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.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
- src/jdk.dev/share/classes/sun/tools/native2ascii/A2NFilter.java
- src/jdk.dev/share/classes/sun/tools/native2ascii/Main.java
- src/jdk.dev/share/classes/sun/tools/native2ascii/N2AFilter.java
- src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java
- test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh
- test/java/lang/Character/UnicodeBlock/NonOptimalMapSize.java
- test/sun/nio/cs/Test4200310.sh
- 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
- test/sun/tools/jhat/hprof.bin
- test/sun/tools/jhat/jmap.bin
- test/sun/tools/jhat/minimal.bin
- test/sun/tools/jmap/heapconfig/LingeredApp.java
- test/sun/tools/jmap/heapconfig/LingeredAppTest.java
- test/sun/tools/native2ascii/A2N_4630463
- test/sun/tools/native2ascii/A2N_4630463.expected
- test/sun/tools/native2ascii/A2N_4630971
- test/sun/tools/native2ascii/A2N_4701617
- test/sun/tools/native2ascii/A2N_4701617.expected
- test/sun/tools/native2ascii/A2N_6247817
- test/sun/tools/native2ascii/N2A_4636448
- test/sun/tools/native2ascii/N2A_4636448.expected
- test/sun/tools/native2ascii/Native2AsciiTests.sh
- test/sun/tools/native2ascii/NativeErrors.java
- test/sun/tools/native2ascii/Permission.java
- test/sun/tools/native2ascii/resources/ImmutableResourceTest.java
- test/sun/tools/native2ascii/test1
- test/sun/tools/native2ascii/test3