Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Fri Oct 26 13:10:56 2012 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Fri Oct 26 16:40:57 2012 -0700
     1.3 @@ -90,7 +90,7 @@
     1.4          EnumSet.of(JavaFileObject.Kind.SOURCE, JavaFileObject.Kind.CLASS);
     1.5  
     1.6      protected boolean mmappedIO;
     1.7 -    protected boolean ignoreSymbolFile;
     1.8 +    protected boolean symbolFileEnabled;
     1.9  
    1.10      protected enum SortFiles implements Comparator<File> {
    1.11          FORWARD {
    1.12 @@ -142,7 +142,7 @@
    1.13              zipFileIndexCache = ZipFileIndexCache.getSharedInstance();
    1.14  
    1.15          mmappedIO = options.isSet("mmappedIO");
    1.16 -        ignoreSymbolFile = options.isSet("ignore.symbol.file");
    1.17 +        symbolFileEnabled = !options.isSet("ignore.symbol.file");
    1.18  
    1.19          String sf = options.get("sortFiles");
    1.20          if (sf != null) {
    1.21 @@ -150,6 +150,13 @@
    1.22          }
    1.23      }
    1.24  
    1.25 +    /**
    1.26 +     * Set whether or not to use ct.sym as an alternate to rt.jar.
    1.27 +     */
    1.28 +    public void setSymbolFileEnabled(boolean b) {
    1.29 +        symbolFileEnabled = b;
    1.30 +    }
    1.31 +
    1.32      @Override
    1.33      public boolean isDefaultBootClassPath() {
    1.34          return locations.isDefaultBootClassPath();
    1.35 @@ -466,7 +473,7 @@
    1.36       */
    1.37      private Archive openArchive(File zipFileName, boolean useOptimizedZip) throws IOException {
    1.38          File origZipFileName = zipFileName;
    1.39 -        if (!ignoreSymbolFile && locations.isDefaultBootClassPathRtJar(zipFileName)) {
    1.40 +        if (symbolFileEnabled && locations.isDefaultBootClassPathRtJar(zipFileName)) {
    1.41              File file = zipFileName.getParentFile().getParentFile(); // ${java.home}
    1.42              if (new File(file.getName()).equals(new File("jre")))
    1.43                  file = file.getParentFile();