diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | java/lang/System.java | 6 |
2 files changed, 11 insertions, 5 deletions
@@ -1,7 +1,13 @@ +2008-09-16 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * java/lang/System.java (getenv): Reinstate + use of EnvironmentMap as opposed to raw + HashMap. + 2008-09-16 Mario Torre <neugens@aicas.com> - * java/lang/System.java (getenv): Fix env entries of the form - key=value=value=value not parsed correctly. + * java/lang/System.java (getenv): Fix env entries of the form + key=value=value=value not parsed correctly. 2008-09-15 Andrew John Hughes <gnu_andrew@member.fsf.org> diff --git a/java/lang/System.java b/java/lang/System.java index 6be313155..58b1bbad3 100644 --- a/java/lang/System.java +++ b/java/lang/System.java @@ -549,7 +549,7 @@ public final class System if (environmentMap == null) { - Map<String, String> _map = new HashMap(); + Map<String,String> variables = new EnvironmentMap(); List<String> environ = (List<String>)VMSystem.environ(); for (String envEntry : environ) { @@ -561,11 +561,11 @@ public final class System int equalSignIndex = envEntry.indexOf('='); String key = envEntry.substring(0, equalSignIndex); String value = envEntry.substring(equalSignIndex + 1); - _map.put(key, value); + variables.put(key, value); } } - environmentMap = Collections.unmodifiableMap(_map); + environmentMap = Collections.unmodifiableMap(variables); } return environmentMap; |