Mercurial > hg > openjdk > jdk6 > jdk

changeset 1805:fe5bbc4baa28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8198963: Fix new rmi property name Reviewed-by: smarks
author robm
date Sun, 04 Mar 2018 16:33:27 +0000
parents 8072a355d3c0
children 165f080ecc69
files src/share/classes/sun/rmi/transport/tcp/TCPTransport.java test/sun/rmi/transport/proxy/EagerHttpFallback.java test/sun/rmi/transport/tcp/DisableRMIOverHttp/DisableRMIOverHTTPTest.java test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java
diffstat 4 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java	Wed Oct 11 15:47:39 2017 +0530
+++ b/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java	Sun Mar 04 16:33:27 2018 +0000
@@ -119,7 +119,7 @@
 
     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 */
--- a/test/sun/rmi/transport/proxy/EagerHttpFallback.java	Wed Oct 11 15:47:39 2017 +0530
+++ b/test/sun/rmi/transport/proxy/EagerHttpFallback.java	Sun Mar 04 16:33:27 2018 +0000
@@ -27,7 +27,7 @@
  *          sun.rmi.transport.proxy.eagerHttpFallback system property is set.
  * @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.*;
@@ -45,8 +45,6 @@
                            "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
--- a/test/sun/rmi/transport/tcp/DisableRMIOverHttp/DisableRMIOverHTTPTest.java	Wed Oct 11 15:47:39 2017 +0530
+++ b/test/sun/rmi/transport/tcp/DisableRMIOverHttp/DisableRMIOverHTTPTest.java	Sun Mar 04 16:33:27 2018 +0000
@@ -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 @@
         boolean incomingHttpDisabled =
                 Boolean.valueOf(
                     System.getProperty(
-                            "java.rmi.server.disableIncomingHttp", "true")
+                            "sun.rmi.server.disableIncomingHttp", "true")
                         .equalsIgnoreCase("true"));
 
         // Set the socket factory.
--- a/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java	Wed Oct 11 15:47:39 2017 +0530
+++ b/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java	Sun Mar 04 16:33:27 2018 +0000
@@ -32,7 +32,7 @@
  * @build TestImpl
  * @build TestImpl_Stub
  * @build BlockAcceptTest
- * @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