Merge
authorduke
Wed, 05 Jul 2017 21:41:36 +0200
changeset 37916 627154540b60
parent 37915 be4ff50b6cb6 (diff)
parent 37914 a2f43d835fa1 (current diff)
child 37925 3560b89fb532
Merge
jdk/make/non-build-utils/src/build/tools/makeclasslist/makeClasslist.js
jdk/make/src/classes/build/tools/addjsum/AddJsum.java
jdk/src/java.base/share/classes/java/util/regex/UnicodeProp.java
jdk/src/java.httpclient/share/classes/java/net/http/CharsetToolkit.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/CGIHandler.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpAwareServerSocket.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpOutputStream.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpReceiveSocket.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendInputStream.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendOutputStream.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendSocket.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIDirectSocketFactory.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIHttpToCGISocketFactory.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMISocketInfo.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/WrappedSocket.java
jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/libsoftcrypto.h
jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SortResourcesPlugin.java
jdk/test/java/rmi/transport/httpSocket/HttpSocketTest.java
jdk/test/java/rmi/transport/httpSocket/HttpSocketTest_Stub.java
jdk/test/java/rmi/transport/httpSocket/security.policy
jdk/test/java/util/jar/JarFile/MultiReleaseJarAPI.java
jdk/test/java/util/jar/JarFile/MultiReleaseJarHttpProperties.java
jdk/test/java/util/jar/JarFile/MultiReleaseJarIterators.java
jdk/test/java/util/jar/JarFile/MultiReleaseJarProperties.java
jdk/test/java/util/jar/JarFile/MultiReleaseJarSecurity.java
jdk/test/sun/rmi/transport/proxy/DisableHttpDefaultValue.java
jdk/test/sun/rmi/transport/proxy/EagerHttpFallback.java
jdk/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java
jdk/test/sun/rmi/transport/tcp/blockAccept/TestIface.java
jdk/test/sun/rmi/transport/tcp/blockAccept/TestImpl.java
jdk/test/sun/rmi/transport/tcp/blockAccept/TestImpl_Stub.java
jdk/test/sun/rmi/transport/tcp/blockAccept/security.policy
jdk/test/tools/jlink/plugins/SorterPluginTest.java
--- a/corba/.hgtags	Wed Jul 05 21:41:29 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 21:41:36 2017 +0200
@@ -360,3 +360,4 @@
 7bab1b1b36824924b1c657a8419369ba93d198d3 jdk-9+115
 7dfa7377a5e601b8f740741a9a80e04c72dd04d6 jdk-9+116
 7a1b36bf2fe55a9a7732489ccdd326c910329a7e jdk-9+117
+8c2c2d17f7ce92a31c9ccb44a122ec62f5a85ace jdk-9+118