# HG changeset patch
# User redestad
# Date 1558523944 -7200
# Node ID e2c952c7ff20e349002c581b273c8f12a865ace1
# Parent  f982c1a6582c0588b84a4e78b98b790a1c32f01a
8224589: Improve startup behavior of SecurityProperties
Reviewed-by: alanb

diff -r f982c1a6582c -r e2c952c7ff20 src/java.base/share/classes/sun/security/util/SecurityProperties.java
--- a/src/java.base/share/classes/sun/security/util/SecurityProperties.java	Wed May 22 06:29:08 2019 -0400
+++ b/src/java.base/share/classes/sun/security/util/SecurityProperties.java	Wed May 22 13:19:04 2019 +0200
@@ -43,15 +43,20 @@
      * @return the value of the system or security property
      */
     public static String privilegedGetOverridable(String propName) {
-        return AccessController.doPrivileged((PrivilegedAction<String>)
-            () -> {
-                String val = System.getProperty(propName);
-                if (val == null) {
-                    return Security.getProperty(propName);
-                } else {
-                    return val;
-                }
-            });
+        if (System.getSecurityManager() == null) {
+            return getOverridableProperty(propName);
+        } else {
+            return AccessController.doPrivileged((PrivilegedAction<String>) () -> getOverridableProperty(propName));
+        }
+    }
+
+    private static String getOverridableProperty(String propName) {
+        String val = System.getProperty(propName);
+        if (val == null) {
+            return Security.getProperty(propName);
+        } else {
+            return val;
+        }
     }
 
     /**