hg: valhalla/valhalla/jdk: Merge

david.simms at oracle.com david.simms at oracle.com
Thu Aug 10 08:22:18 UTC 2017


Changeset: 310956f66074
Author:    dsimms
Date:      2017-08-10 09:23 +0200
URL:       http://hg.openjdk.java.net/valhalla/valhalla/jdk/rev/310956f66074

Merge

+ make/data/docs-resources/resources/jdk-default.css
- make/data/docs-resources/specs/resources/jdk-default.css
! src/java.base/share/classes/java/lang/Class.java
! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/java/lang/invoke/LambdaForm.java
! src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/lang/invoke/MethodType.java
! src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java
! src/java.base/share/classes/module-info.java
- src/java.base/share/classes/overview-core.html
- src/java.base/share/classes/sun/security/ssl/RecordType.java
- src/java.base/share/specs/serialization/changelog.md
- src/java.base/share/specs/serialization/class.md
- src/java.base/share/specs/serialization/examples.md
- src/java.base/share/specs/serialization/exceptions.md
- src/java.base/share/specs/serialization/images/class.gif
- src/java.base/share/specs/serialization/images/version.gif
- src/java.base/share/specs/serialization/index.md
- src/java.base/share/specs/serialization/input.md
- src/java.base/share/specs/serialization/output.md
- src/java.base/share/specs/serialization/protocol.md
- src/java.base/share/specs/serialization/security.md
- src/java.base/share/specs/serialization/serial-arch.md
- src/java.base/share/specs/serialization/version.md
- src/java.desktop/share/specs/AWT_Native_Interface.html
- src/java.instrument/share/classes/java/lang/instrument/package.html
- src/java.management/share/specs/JVM-MANAGEMENT-MIB.mib
! test/TEST.groups
+ test/com/sun/net/httpserver/EchoHandler.java
+ test/com/sun/net/httpserver/SimpleFileServer.java
- test/java/io/File/MacPathTest.sh
- test/java/io/File/basic.sh
- test/java/io/FileOutputStream/FileOpen.sh
- test/java/io/FileOutputStream/FileOpenNeg.java
- test/java/io/FileOutputStream/FileOpenPos.java
- test/java/io/Serializable/class/NonSerialA_1.java
+ test/java/io/Serializable/class/NonSerialA_1/A.java
- test/java/io/Serializable/class/NonSerialA_2.java
+ test/java/io/Serializable/class/NonSerialA_2/A.java
+ test/java/io/Serializable/class/NonSerializableTest.java
- test/java/io/Serializable/class/SerialA.java
- test/java/io/Serializable/class/SerialA_1.java
+ test/java/io/Serializable/class/SerialA_1/A.java
- test/java/io/Serializable/class/SerialA_2.java
+ test/java/io/Serializable/class/SerialA_2/A.java
- test/java/io/Serializable/class/SerialA_3.java
+ test/java/io/Serializable/class/SerialA_3/A.java
- test/java/io/Serializable/class/Test.java
+ test/java/io/Serializable/class/TestEntry.java
- test/java/io/Serializable/class/run.sh
- test/java/io/Serializable/evolution/AddedExternField/run.sh
- test/java/io/Serializable/evolution/RenamePackage/run.sh
+ test/java/io/Serializable/maskSyntheticModifier/MaskSyntheticModifierTest.java
- test/java/io/Serializable/maskSyntheticModifier/Test.java
- test/java/io/Serializable/maskSyntheticModifier/run.sh
+ test/java/io/Serializable/packageAccess/PackageAccessTest.java
- test/java/io/Serializable/packageAccess/Test.java
- test/java/io/Serializable/packageAccess/run.sh
+ test/java/io/Serializable/resolveClass/consTest/ConsTest.java
- test/java/io/Serializable/resolveClass/consTest/Test.java
- test/java/io/Serializable/resolveClass/consTest/run.sh
+ test/java/io/Serializable/resolveClass/deserializeButton/DeserializeButtonTest.java
- test/java/io/Serializable/resolveClass/deserializeButton/Test.java
- test/java/io/Serializable/resolveClass/deserializeButton/run.sh
+ test/java/io/Serializable/serialver/classpath/ClasspathTest.java
- test/java/io/Serializable/serialver/classpath/Test.java
- test/java/io/Serializable/serialver/classpath/run.sh
+ test/java/io/Serializable/serialver/nested/NestedTest.java
- test/java/io/Serializable/serialver/nested/Test.java
- test/java/io/Serializable/serialver/nested/run.sh
+ test/java/io/Serializable/subclass/SubclassTest.java
- test/java/io/Serializable/subclass/Test.java
- test/java/io/Serializable/subclass/run.sh
+ test/java/io/Serializable/superclassDataLoss/SuperclassDataLossTest.java
- test/java/io/Serializable/superclassDataLoss/Test.java
- test/java/io/Serializable/superclassDataLoss/run.sh
- test/java/io/Serializable/unnamedPackageSwitch/Test.java
+ test/java/io/Serializable/unnamedPackageSwitch/UnnamedPackageSwitchTest.java
- test/java/io/Serializable/unnamedPackageSwitch/run.sh
+ test/java/lang/invoke/common/test/java/lang/invoke/lib/CodeCacheOverflowProcessor.java
+ test/java/lang/invoke/common/test/java/lang/invoke/lib/Helper.java
- test/java/net/Socket/OldSocketImpl.sh
- test/java/net/URL/B5086147.sh
- test/java/net/URLClassLoader/B5077773.java
- test/java/net/URLClassLoader/B5077773.sh
- test/java/net/URLClassLoader/closetest/build.sh
- test/java/net/URLClassLoader/closetest/build2.sh
- test/java/net/URLClassLoader/getresourceasstream/test.sh
- test/java/net/URLClassLoader/sealing/checksealed.sh
- test/java/net/URLConnection/6212146/test.sh
- test/java/net/URLConnection/UNCTest.sh
+ test/java/net/httpclient/HttpEchoHandler.java
+ test/java/net/httpclient/http2/server/Http2EchoHandler.java
- test/java/nio/Buffer/LimitDirectMemory.sh
- test/java/nio/channels/AsynchronousChannelGroup/Attack.java
- test/java/nio/channels/AsynchronousChannelGroup/PrivilegedThreadFactory.java
+ test/java/nio/channels/AsynchronousChannelGroup/bootlib/Attack.java
+ test/java/nio/channels/AsynchronousChannelGroup/bootlib/PrivilegedThreadFactory.java
- test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh
- test/java/nio/channels/DatagramChannel/NetworkConfiguration.java
- test/java/nio/channels/Selector/lots_of_updates.sh
- test/java/nio/channels/SocketChannel/Open.sh
- test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh
- test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh
- test/java/nio/charset/Charset/default.sh
- test/java/nio/charset/coders/CheckSJISMappingProp.sh
+ test/java/nio/charset/spi/CharsetTest.java
- test/java/nio/charset/spi/Test.java
- test/java/nio/charset/spi/basic.sh
- test/java/nio/file/Files/delete_on_close.sh
+ test/java/nio/file/Files/walkFileTree/FindTest.java
- test/java/nio/file/Files/walkFileTree/PrintFileTree.java
- test/java/nio/file/Files/walkFileTree/find.sh
+ test/java/nio/file/Path/MacPath.java
- test/java/nio/file/Path/MacPathTest.sh
- test/java/util/Arrays/ParallelPrefix.java
- test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResourcesProvider.java
+ test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/spi/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResourcesProvider.java
+ test/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/spi/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResourcesProvider.java
+ test/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/spi/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResourcesProvider.java
+ test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/spi/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/classes/MyResourcesProvider.java
+ test/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/classes/spi/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/classes/MyResourcesProvider.java
+ test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/classes/spi/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/props/MyResourcesProvider.java
+ test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/props/spi/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResourcesProvider.java
+ test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/spi/MyResourcesProvider.java
- test/java/util/ServiceLoader/modules/BadProvidersTest.java
- test/java/util/ServiceLoader/modules/Basic.java
- test/java/util/ServiceLoader/modules/badfactories/badreturntype/ProviderFactory.java
- test/java/util/ServiceLoader/modules/badfactories/classnotpublic/ProviderFactory.java
- test/java/util/ServiceLoader/modules/badfactories/classnotpublic/Service.java
- test/java/util/ServiceLoader/modules/badfactories/methodnotpublic/ProviderFactory.java
- test/java/util/ServiceLoader/modules/badfactories/methodnotpublic/Service.java
- test/java/util/ServiceLoader/modules/badfactories/returnsnull/ProviderFactory.java
- test/java/util/ServiceLoader/modules/badfactories/returnsnull/Service.java
- test/java/util/ServiceLoader/modules/badfactories/throwsexception/ProviderFactory.java
- test/java/util/ServiceLoader/modules/badfactories/throwsexception/Service.java
- test/java/util/ServiceLoader/modules/badproviders/ctornotpublic/Provider.java
- test/java/util/ServiceLoader/modules/badproviders/ctornotpublic/Service.java
- test/java/util/ServiceLoader/modules/badproviders/notasubtype/Provider.java
- test/java/util/ServiceLoader/modules/badproviders/notpublic/Provider.java
- test/java/util/ServiceLoader/modules/badproviders/notpublic/Service.java
- test/java/util/ServiceLoader/modules/badproviders/throwsexception/Provider.java
- test/java/util/ServiceLoader/modules/badproviders/throwsexception/Service.java
- test/java/util/ServiceLoader/modules/modules/bananascript/module-info.java
- test/java/util/ServiceLoader/modules/modules/bananascript/org/banana/BananaScript.java
- test/java/util/ServiceLoader/modules/modules/bananascript/org/banana/BananaScriptEngineFactory.java
- test/java/util/ServiceLoader/modules/modules/test1/module-info.java
- test/java/util/ServiceLoader/modules/modules/test1/p/ProviderFactory.java
- test/java/util/ServiceLoader/modules/modules/test1/p/Service.java
- test/java/util/ServiceLoader/modules/modules/test2/module-info.java
- test/java/util/ServiceLoader/modules/modules/test2/p/Provider.java
- test/java/util/ServiceLoader/modules/modules/test2/p/Service.java
- test/java/util/ServiceLoader/modules/src/pearscript/META-INF/services/javax.script.ScriptEngineFactory
- test/java/util/ServiceLoader/modules/src/pearscript/org/pear/PearScript.java
- test/java/util/ServiceLoader/modules/src/pearscript/org/pear/PearScriptEngineFactory.java
- test/lib/testlibrary/CompilerUtils.java
- test/lib/testlibrary/JavaToolUtils.java
- test/lib/testlibrary/ModuleInfoMaker.java
- test/lib/testlibrary/jdk/testlibrary/FileUtils.java
- test/lib/testlibrary/jdk/testlibrary/FilterClassLoader.java
- test/lib/testlibrary/jdk/testlibrary/IOUtils.java
- test/lib/testlibrary/jdk/testlibrary/JarUtils.java
- test/lib/testlibrary/jdk/testlibrary/LockFreeLogManager.java
- test/lib/testlibrary/jdk/testlibrary/NetworkConfiguration.java
- test/lib/testlibrary/jdk/testlibrary/ParentLastURLClassLoader.java
- test/lib/testlibrary/jdk/testlibrary/Platform.java
- test/lib/testlibrary/jdk/testlibrary/SerializationUtils.java
- test/lib/testlibrary/jdk/testlibrary/TimeLimitedRunner.java
- test/lib/testlibrary/jdk/testlibrary/management/InputArguments.java
- test/lib/testlibrary/jdk/testlibrary/management/ThreadMXBeanTool.java
- test/lib/testlibrary/jsr292/com/oracle/testlibrary/jsr292/CodeCacheOverflowProcessor.java
- test/lib/testlibrary/jsr292/com/oracle/testlibrary/jsr292/Helper.java
- test/sun/net/InetAddress/nameservice/dns/cname.sh
- test/sun/net/ftp/MarkResetTest.sh
- test/sun/net/www/protocol/file/DirPermissionDenied.sh
- test/sun/net/www/protocol/jar/B5105410.sh
- test/sun/net/www/protocol/jar/copyin.sh
- test/sun/net/www/protocol/jar/getcontenttype.sh
- test/sun/net/www/protocol/jar/jarbug/run.sh
- test/sun/net/www/protocol/jar/jarbug/src/test/RunAllTests.java
- test/sun/net/www/protocol/jrt/other_resources.sh
- test/tools/jar/multiRelease/data/runtimetest/base/testpackage/Helper.java
- test/tools/jar/multiRelease/data/runtimetest/base/testpackage/Main.java
- test/tools/jar/multiRelease/data/runtimetest/base/versionResource
+ test/tools/jar/multiRelease/data/runtimetest/testpackage/Helper.java.template
+ test/tools/jar/multiRelease/data/runtimetest/testpackage/Main.java.template
- test/tools/jar/multiRelease/data/runtimetest/v10/testpackage/Helper.java
- test/tools/jar/multiRelease/data/runtimetest/v10/testpackage/Main.java
- test/tools/jar/multiRelease/data/runtimetest/v10/versionResource
- test/tools/jar/multiRelease/data/runtimetest/v9/testpackage/Helper.java
- test/tools/jar/multiRelease/data/runtimetest/v9/testpackage/Main.java
- test/tools/jar/multiRelease/data/runtimetest/v9/versionResource
+ test/tools/jar/multiRelease/data/runtimetest/versionResource.template
- test/tools/launcher/modules/permit/AttemptAccess.java
- test/tools/launcher/modules/permit/PermitIllegalAccess.java



More information about the valhalla-dev mailing list