diff options
| author | Jeroen Frijters <jeroen@sumatra.nl> | 2005-09-26 11:19:19 +0000 |
|---|---|---|
| committer | Jeroen Frijters <jeroen@sumatra.nl> | 2005-09-26 11:19:19 +0000 |
| commit | 722f212717489761ee1d30b331eeb7ad2bac2492 (patch) | |
| tree | 7b1245f99cca2275278d6056c71cb47cb7cbbc59 | |
| parent | d1cb588bbb1c6d9d111e534bc312e2e2fb7d46cc (diff) | |
| download | classpath-722f212717489761ee1d30b331eeb7ad2bac2492.tar.gz | |
2005-09-25 Jeroen Frijters <jeroen@frijters.net>
* java/lang/System.java,
vm/reference/java/lang/VMSystem.java: Removed generic type
from VMSystem.environ() signature.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | java/lang/System.java | 2 | ||||
| -rw-r--r-- | vm/reference/java/lang/VMSystem.java | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,5 +1,11 @@ 2005-09-25 Jeroen Frijters <jeroen@frijters.net> + * java/lang/System.java, + vm/reference/java/lang/VMSystem.java: Removed generic type + from VMSystem.environ() signature. + +2005-09-25 Jeroen Frijters <jeroen@frijters.net> + * java/lang/MalformedParameterizedTypeException.java: Removed. 2005-09-25 Tom Tromey <tromey@redhat.com> diff --git a/java/lang/System.java b/java/lang/System.java index 07058d1bd..d6c0609ac 100644 --- a/java/lang/System.java +++ b/java/lang/System.java @@ -495,7 +495,7 @@ public final class System sm.checkPermission(new RuntimePermission("getenv.*")); if (environmentMap == null) { - List<String> environ = VMSystem.environ(); + List<String> environ = (List<String>)VMSystem.environ(); Map<String,String> variables = new EnvironmentMap(); for (String pair : environ) { diff --git a/vm/reference/java/lang/VMSystem.java b/vm/reference/java/lang/VMSystem.java index d91f4f897..80c74b468 100644 --- a/vm/reference/java/lang/VMSystem.java +++ b/vm/reference/java/lang/VMSystem.java @@ -143,7 +143,7 @@ final class VMSystem * * @return a list of 'name=value' pairs. */ - static native List<String> environ(); + static native List environ(); /** * Gets the value of an environment variable from the current |