src/share/classes/com/sun/tools/javac/file/JavacFileManager.java

changeset 882
3d45cc94ee0f
parent 839
a8437c34fdc7
child 893
8f0dcb9499db
     1.1 --- a/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Fri Feb 18 12:28:49 2011 +0000
     1.2 +++ b/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Fri Feb 18 08:12:06 2011 -0800
     1.3 @@ -164,9 +164,7 @@
     1.4  
     1.5          fsInfo = FSInfo.instance(context);
     1.6  
     1.7 -        // retain check for system property for compatibility
     1.8 -        useZipFileIndex = options.isUnset("useJavaUtilZip")
     1.9 -                && System.getProperty("useJavaUtilZip") == null;
    1.10 +        useZipFileIndex = options.isSet("useOptimizedZip");
    1.11          if (useZipFileIndex)
    1.12              zipFileIndexCache = ZipFileIndexCache.getSharedInstance();
    1.13  
    1.14 @@ -499,8 +497,7 @@
    1.15  
    1.16              if (!useZipFileIndex) {
    1.17                  zdir = new ZipFile(zipFileName);
    1.18 -            }
    1.19 -            else {
    1.20 +            } else {
    1.21                  usePreindexedCache = options.isSet("usezipindex");
    1.22                  preindexCacheLocation = options.get("java.io.tmpdir");
    1.23                  String optCacheLoc = options.get("cachezipindexdir");

mercurial