hg: jdk/sandbox: Merge

[alan.bateman at oracle.com]

Changeset: 16c087c9103e
Author:    alanb
Date:      2019-05-03 08:26 +0100
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/16c087c9103e

Merge

- src/hotspot/share/gc/cms/cmsCollectorPolicy.cpp
- src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp
- src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp
- src/hotspot/share/gc/g1/g1CollectorPolicy.cpp
- src/hotspot/share/gc/g1/g1CollectorPolicy.hpp
- src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.cpp
- src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp
- src/hotspot/share/gc/parallel/generationSizer.cpp
- src/hotspot/share/gc/parallel/generationSizer.hpp
- src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.cpp
- src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.hpp
- src/hotspot/share/gc/shared/collectorPolicy.cpp
- src/hotspot/share/gc/shared/collectorPolicy.hpp
- src/hotspot/share/gc/shared/gcArguments.inline.hpp
- src/hotspot/share/gc/z/zCollectorPolicy.cpp
- src/hotspot/share/gc/z/zCollectorPolicy.hpp
- src/hotspot/share/jvmci/systemDictionary_jvmci.hpp
! src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java
! src/java.base/share/classes/java/net/HttpConnectSocketImpl.java
! src/java.base/share/classes/java/net/ServerSocket.java
! src/java.base/share/classes/java/net/Socket.java
! src/java.base/share/classes/java/net/SocketImpl.java
! src/java.base/share/classes/java/net/SocksSocketImpl.java
! src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/MetaspaceWrapperObject.java
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/.checkstyle_checks.xml
- test/jdk/java/lang/String/concat/StringConcatFactoryEmptyMethods.java
- test/jdk/java/net/Socket/OldImpl.java
- test/jdk/java/net/Socket/OldSocketImpl.java
- test/jdk/java/net/Socket/OldSocketImplTestDriver.java
! test/jdk/java/net/SocketOption/OptionsTest.java
- test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java
- test/jdk/jdk/nio/zipfs/jarfs/root/dir1/leaf1.txt
- test/jdk/jdk/nio/zipfs/jarfs/root/dir1/leaf2.txt
- test/jdk/jdk/nio/zipfs/jarfs/root/dir2/leaf3.txt
- test/jdk/jdk/nio/zipfs/jarfs/root/dir2/leaf4.txt
- test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir1/leaf1.txt
- test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir1/leaf2.txt
- test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir2/leaf3.txt
- test/jdk/jdk/nio/zipfs/jarfs/v9/root/dir2/leaf4.txt