Uploaded image for project: 'JDK'
  1. JDK
  2. JDK-8185365

Tidy up leftover dead code after JDK-8136570

    Details

    • Type: Bug
    • Status: Resolved
    • Priority: P3
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 10
    • Component/s: infrastructure
    • Labels:
    • Subcomponent:
    • Resolved In Build:
      b18

      Description

      JDK-8136570 stopped changing the NLSPATH and XFILESEARCHPATH environment variables and removed setPathEnvironment, but there are vestigial references.

      diff --git a/make/mapfiles/libjava/reorder-x86 b/make/mapfiles/libjava/reorder-x86
      --- a/make/mapfiles/libjava/reorder-x86
      +++ b/make/mapfiles/libjava/reorder-x86
      @@ -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;
      diff --git a/test/java/lang/ProcessBuilder/Basic.java b/test/java/lang/ProcessBuilder/Basic.java
      --- a/test/java/lang/ProcessBuilder/Basic.java
      +++ b/test/java/lang/ProcessBuilder/Basic.java
      @@ -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())

        Attachments

          Issue Links

            Activity

              People

              • Assignee:
                martin Martin Buchholz
                Reporter:
                martin Martin Buchholz
              • Votes:
                0 Vote for this issue
                Watchers:
                4 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: