Added security manager check.

Signed-off-by: Tomáš Kraus <tomas.kraus@oracle.com>
eclipse-ee4j · Apr 19, 2023 · 5b50d93 · 5b50d93
1 parent b8a7881
commit 5b50d93
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/impl/src/main/java/org/eclipse/parsson/JsonContext.java b/impl/src/main/java/org/eclipse/parsson/JsonContext.java
@@ -45,6 +45,8 @@ class JsonContext {
 
     static final String PROPERTY_BUFFER_POOL = BufferPool.class.getName();
 
+    @SuppressWarnings("removal")
+    private static final boolean IS_SECURITY_MANAGER = System.getSecurityManager() != null;
     private final Map<String, ?> config;
 
     // Maximum value of BigInteger scale value
@@ -115,12 +117,12 @@ private static Integer getIntSystemProperty(String propertyName) throws JsonExce
 
     @SuppressWarnings("removal")
     private static String getSystemProperty(String propertyName) throws JsonException {
-        return AccessController.doPrivileged(
-                (PrivilegedAction<String>) () -> System.getProperty(propertyName));
-    }
-
-    private static String propertyAction(String propertyName) {
-        return System.getProperty(propertyName);
+        if (IS_SECURITY_MANAGER) {
+            return AccessController.doPrivileged(
+                    (PrivilegedAction<String>) () -> System.getProperty(propertyName));
+        } else {
+            return System.getProperty(propertyName);
+        }
     }
 
     private static int propertyStringToInt(String propertyName, String propertyValue) throws JsonException {