changeset 13241:05732fed4902

Merge
author alitvinov
date Mon, 11 Jun 2018 12:13:17 +0100
parents 355822b67ab3 5fded5e7bdf5
children 2dff68c0c44f
files .hgtags
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Jun 08 07:54:59 2018 -0700
+++ b/.hgtags	Mon Jun 11 12:13:17 2018 +0100
@@ -905,3 +905,5 @@
 6eeca4fb7748e8bdca4afbd6785b04376b1d44cc jdk8u181-b04
 f34c24087b0e6f52391f491d6c3a608616d1db2c jdk8u181-b05
 076f5fd6258846fce7010a598de2c7583628bb1e jdk8u181-b06
+446351642449411566d7fd0a26e32c8825f4f03e jdk8u181-b07
+f26f68978e0e7ed0e6e61f9d64fa2d06f1c1a24c jdk8u181-b08
--- a/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java	Fri Jun 08 07:54:59 2018 -0700
+++ b/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java	Mon Jun 11 12:13:17 2018 +0100
@@ -727,7 +727,6 @@
                 int magic = in.readInt();
 
                 if (magic == POST) {
-                    System.err.println("DISABLED: " + disableIncomingHttp);
                     if (disableIncomingHttp) {
                         throw new RemoteException("RMI over HTTP is disabled");
                     }