http-client-branch: rename jdk.httpclient.internal.selector.timeout property http-client-branch
authorchegar
Fri, 09 Mar 2018 17:36:02 +0000
branchhttp-client-branch
changeset 56271 e1eab097c6d7
parent 56270 5c861402c69e
child 56272 7394452786ba
http-client-branch: rename jdk.httpclient.internal.selector.timeout property
src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java	Fri Mar 09 16:52:31 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java	Fri Mar 09 17:36:02 2018 +0000
@@ -489,15 +489,15 @@
         // To avoid misuse of the property, the delay that can be specified
         // is comprised between [MIN_NODEADLINE, MAX_NODEADLINE], and its default
         // value if unspecified (or <= 0) is DEF_NODEADLINE = 3000ms
-        // The property is -Djdk.httpclient.internal.selector.timeout=<millis>
+        // The property is -Djdk.internal.httpclient.selectorTimeout=<millis>
         private static final int MIN_NODEADLINE = 1000; // ms
         private static final int MAX_NODEADLINE = 1000 * 1200; // ms
         private static final int DEF_NODEADLINE = 3000; // ms
         private static final long NODEADLINE; // default is DEF_NODEADLINE ms
         static {
             // ensure NODEADLINE is initialized with some valid value.
-            long deadline =  Utils.getIntegerNetProperty(
-                "jdk.httpclient.internal.selector.timeout",
+            long deadline =  Utils.getIntegerProperty(
+                "jdk.internal.httpclient.selectorTimeout",
                 DEF_NODEADLINE); // millis
             if (deadline <= 0) deadline = DEF_NODEADLINE;
             deadline = Math.max(deadline, MIN_NODEADLINE);
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java	Fri Mar 09 16:52:31 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java	Fri Mar 09 17:36:02 2018 +0000
@@ -395,6 +395,11 @@
                 System.getProperty(name));
     }
 
+    public static int getIntegerProperty(String name, int defaultValue) {
+        return AccessController.doPrivileged((PrivilegedAction<Integer>) () ->
+                Integer.parseInt(System.getProperty(name, String.valueOf(defaultValue)));
+    }
+
     public static SSLParameters copySSLParameters(SSLParameters p) {
         SSLParameters p1 = new SSLParameters();
         p1.setAlgorithmConstraints(p.getAlgorithmConstraints());