From 586f929963f007f2f240df3230fbeb42ac7567c9 Mon Sep 17 00:00:00 2001
From: robm <unknown>
Date: Sun, 4 Mar 2018 16:33:27 +0000
Subject: [PATCH] 8198963: Fix new rmi property name Reviewed-by: smarks

---
 src/share/classes/sun/rmi/transport/tcp/TCPTransport.java     | 2 +-
 test/sun/rmi/transport/proxy/EagerHttpFallback.java           | 4 +---
 .../tcp/DisableRMIOverHttp/DisableRMIOverHTTPTest.java        | 4 ++--
 test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java   | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java b/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
index cb27fa93f..f4cdfdb68 100644
--- a/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
+++ b/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
@@ -121,7 +121,7 @@ public class TCPTransport extends Transport {
 
     private static final boolean disableIncomingHttp =
         java.security.AccessController.doPrivileged(
-            new GetPropertyAction("java.rmi.server.disableIncomingHttp", "true"))
+            new GetPropertyAction("sun.rmi.server.disableIncomingHttp", "true"))
                 .equalsIgnoreCase("true");
 
     /** total connections handled */
diff --git a/test/sun/rmi/transport/proxy/EagerHttpFallback.java b/test/sun/rmi/transport/proxy/EagerHttpFallback.java
index 7e1507613..70f9d714c 100644
--- a/test/sun/rmi/transport/proxy/EagerHttpFallback.java
+++ b/test/sun/rmi/transport/proxy/EagerHttpFallback.java
@@ -28,7 +28,7 @@
  *
  * @library ../../../../java/rmi/testlibrary
  * @build TestLibrary
- * @run main/othervm -Djava.rmi.server.disableIncomingHttp=false EagerHttpFallback
+ * @run main/othervm -Dsun.rmi.server.disableIncomingHttp=false EagerHttpFallback
  */
 
 import java.rmi.*;
@@ -46,8 +46,6 @@ public class EagerHttpFallback {
                            "true");
         LocateRegistry.createRegistry(FALLBACK_PORT);
 
-        System.err.println("1-DISABLED: " + System.getProperty("java.rmi.server.disableIncomingHttp"));
-
         /*
          * The call below should trigger a ConnectException in the
          * RMIMasterSocketFactory when it attempts a direct connection to
diff --git a/test/sun/rmi/transport/tcp/DisableRMIOverHttp/DisableRMIOverHTTPTest.java b/test/sun/rmi/transport/tcp/DisableRMIOverHttp/DisableRMIOverHTTPTest.java
index 35184d79a..2f5761f8c 100644
--- a/test/sun/rmi/transport/tcp/DisableRMIOverHttp/DisableRMIOverHTTPTest.java
+++ b/test/sun/rmi/transport/tcp/DisableRMIOverHttp/DisableRMIOverHTTPTest.java
@@ -29,7 +29,7 @@
  * @library ../../../../../java/rmi/testlibrary
  * @build TestIface TestImpl
  * @run main/othervm/timeout=60 DisableRMIOverHTTPTest
- * @run main/othervm/timeout=60 -Djava.rmi.server.disableIncomingHttp=false DisableRMIOverHTTPTest
+ * @run main/othervm/timeout=60 -Dsun.rmi.server.disableIncomingHttp=false DisableRMIOverHTTPTest
  */
 
 /*
@@ -60,7 +60,7 @@ public class DisableRMIOverHTTPTest
         boolean incomingHttpDisabled =
                 Boolean.valueOf(
                     System.getProperty(
-                            "java.rmi.server.disableIncomingHttp", "true")
+                            "sun.rmi.server.disableIncomingHttp", "true")
                         .equalsIgnoreCase("true"));
 
         // Set the socket factory.
diff --git a/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java b/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java
index 95da5864f..92399dd08 100644
--- a/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java
+++ b/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java
@@ -29,7 +29,7 @@
  *
  * @library ../../../../../java/rmi/testlibrary
  * @build TestIface TestImpl TestImpl_Stub
- * @run main/othervm/policy=security.policy/timeout=60 -Djava.rmi.server.disableIncomingHttp=false BlockAcceptTest
+ * @run main/othervm/policy=security.policy/timeout=60 -Dsun.rmi.server.disableIncomingHttp=false BlockAcceptTest
  */
 
 /* This test attempts to stymie the RMI accept loop.  The accept loop in
-- 
GitLab