Added security manager check.

Signed-off-by: Tomáš Kraus <tomas.kraus@oracle.com>
eclipse-ee4j · Apr 19, 2023 · a47fa16 · a47fa16
1 parent b8a7881
commit a47fa16
Showing 1 changed file with 6 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
@@ -115,12 +115,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 (System.getSecurityManager() != null) {
+            return AccessController.doPrivileged(
+                    (PrivilegedAction<String>) () -> System.getProperty(propertyName));
+        } else {
+            return System.getProperty(propertyName);
+        }
     }
 
     private static int propertyStringToInt(String propertyName, String propertyValue) throws JsonException {