提交 424ae0ef 编写于 作者: R robm

8198963: Fix new rmi property name

Reviewed-by: smarks
上级 7d7fd064
...@@ -121,7 +121,7 @@ public class TCPTransport extends Transport { ...@@ -121,7 +121,7 @@ public class TCPTransport extends Transport {
private static final boolean disableIncomingHttp = private static final boolean disableIncomingHttp =
java.security.AccessController.doPrivileged( java.security.AccessController.doPrivileged(
new GetPropertyAction("java.rmi.server.disableIncomingHttp", "true")) new GetPropertyAction("sun.rmi.server.disableIncomingHttp", "true"))
.equalsIgnoreCase("true"); .equalsIgnoreCase("true");
/** total connections handled */ /** total connections handled */
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* *
* @library ../../../../java/rmi/testlibrary * @library ../../../../java/rmi/testlibrary
* @build TestLibrary * @build TestLibrary
* @run main/othervm -Djava.rmi.server.disableIncomingHttp=false EagerHttpFallback * @run main/othervm -Dsun.rmi.server.disableIncomingHttp=false EagerHttpFallback
*/ */
import java.rmi.*; import java.rmi.*;
...@@ -46,8 +46,6 @@ public class EagerHttpFallback { ...@@ -46,8 +46,6 @@ public class EagerHttpFallback {
"true"); "true");
LocateRegistry.createRegistry(FALLBACK_PORT); LocateRegistry.createRegistry(FALLBACK_PORT);
System.err.println("1-DISABLED: " + System.getProperty("java.rmi.server.disableIncomingHttp"));
/* /*
* The call below should trigger a ConnectException in the * The call below should trigger a ConnectException in the
* RMIMasterSocketFactory when it attempts a direct connection to * RMIMasterSocketFactory when it attempts a direct connection to
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* @library ../../../../../java/rmi/testlibrary * @library ../../../../../java/rmi/testlibrary
* @build TestIface TestImpl * @build TestIface TestImpl
* @run main/othervm/timeout=60 DisableRMIOverHTTPTest * @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 ...@@ -60,7 +60,7 @@ public class DisableRMIOverHTTPTest
boolean incomingHttpDisabled = boolean incomingHttpDisabled =
Boolean.valueOf( Boolean.valueOf(
System.getProperty( System.getProperty(
"java.rmi.server.disableIncomingHttp", "true") "sun.rmi.server.disableIncomingHttp", "true")
.equalsIgnoreCase("true")); .equalsIgnoreCase("true"));
// Set the socket factory. // Set the socket factory.
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* *
* @library ../../../../../java/rmi/testlibrary * @library ../../../../../java/rmi/testlibrary
* @build TestIface TestImpl TestImpl_Stub * @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 /* This test attempts to stymie the RMI accept loop. The accept loop in
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册