Merge pull request #585 from eclipse/win-env-var

Processing of configurations raised issues in Windows
eclipse · Apr 28, 2023 · 8565716 · 8565716
2 parents b74c7d7 + 56a7d3c
commit 8565716
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/shared/src/main/java/org/eclipse/steady/shared/util/VulasConfiguration.java b/shared/src/main/java/org/eclipse/steady/shared/util/VulasConfiguration.java
@@ -38,6 +38,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -214,7 +215,7 @@ private void appendInitialConfigurations() {
     }
 
     // Add: Environment variables
-    final Map<String, String> env = System.getenv();
+    final Map<String, String> env = new ProcessBuilder().environment();
     Configuration env_config = new MapConfiguration(env);
     addConfiguration(env_config, ENV_CFG_LAYER);
 
@@ -298,14 +299,18 @@ private void addConfiguration(Configuration _cfg, String _source) {
    */
   public void sanitize(Configuration _cfg) {
     final Iterator<String> i = _cfg.getKeys();
+    List<String> keys_to_remove = new ArrayList<String>();
     while (i.hasNext()) {
       final String k = i.next();
       final Matcher m = KEY_PATTERN.matcher(k);
       if (!m.matches()) {
         getLog().warn("Configuration key [" + k + "] removed due to illegal characters");
-        _cfg.clearProperty(k);
+        keys_to_remove.add(k);
       }
     }
+    for (String p : keys_to_remove) {
+      _cfg.clearProperty(p);
+    }
   }
 
   /**