changeset 46044:55b0a570d3d7

8185365: Tidy up leftover dead code after JDK-8136570 Reviewed-by: alanb, rriggs, prr
author martin
date Wed, 26 Jul 2017 14:09:20 -0700
parents 9aa1973383df
children ef191ce8f33f 729fca326a7a
files jdk/make/mapfiles/libjava/reorder-x86 jdk/test/java/lang/ProcessBuilder/Basic.java
diffstat 2 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/make/mapfiles/libjava/reorder-x86	Thu Jul 27 17:15:14 2017 +0200
+++ b/jdk/make/mapfiles/libjava/reorder-x86	Wed Jul 26 14:09:20 2017 -0700
@@ -19,7 +19,6 @@
 text: .text%GetJavaProperties;
 text: .text%uname: OUTPUTDIR/java_props_md.o;
 text: .text%mapLookup: OUTPUTDIR/java_props_md.o;
-text: .text%setPathEnvironment: OUTPUTDIR/java_props_md.o;
 text: .text%JNU_NewStringPlatform;
 text: .text%JNU_CallStaticMethodByName;
 text: .text%NewStringPlatform;
--- a/jdk/test/java/lang/ProcessBuilder/Basic.java	Thu Jul 27 17:15:14 2017 +0200
+++ b/jdk/test/java/lang/ProcessBuilder/Basic.java	Wed Jul 26 14:09:20 2017 -0700
@@ -277,9 +277,7 @@
         environment = new TreeMap<>(environment);
         for (Map.Entry<String,String> e : environment.entrySet())
             // Ignore magic environment variables added by the launcher
-            if (! e.getKey().equals("NLSPATH") &&
-                ! e.getKey().equals("XFILESEARCHPATH") &&
-                ! e.getKey().equals("LD_LIBRARY_PATH"))
+            if (! e.getKey().equals("LD_LIBRARY_PATH"))
                 sb.append(e.getKey())
                     .append('=')
                     .append(e.getValue())