From c633b2f6a0121fa45380a7c5c2071e05fec6808a Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Wed, 17 Sep 2008 23:44:19 +0000 Subject: Reinstate use of EnvironmentMap. 2008-09-16 Andrew John Hughes * java/lang/System.java (getenv): Reinstate use of EnvironmentMap as opposed to raw HashMap. --- ChangeLog | 10 ++++++++-- java/lang/System.java | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e381c0faa..2d44c148b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,13 @@ +2008-09-16 Andrew John Hughes + + * java/lang/System.java (getenv): Reinstate + use of EnvironmentMap as opposed to raw + HashMap. + 2008-09-16 Mario Torre - * 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 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 _map = new HashMap(); + Map variables = new EnvironmentMap(); List environ = (List)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; -- cgit v1.2.1