diff -r 4ce95dc0b908 -r 3d45cc94ee0f src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
--- a/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Fri Feb 18 12:28:49 2011 +0000
+++ b/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Fri Feb 18 08:12:06 2011 -0800
@@ -164,9 +164,7 @@
 
         fsInfo = FSInfo.instance(context);
 
-        // retain check for system property for compatibility
-        useZipFileIndex = options.isUnset("useJavaUtilZip")
-                && System.getProperty("useJavaUtilZip") == null;
+        useZipFileIndex = options.isSet("useOptimizedZip");
         if (useZipFileIndex)
             zipFileIndexCache = ZipFileIndexCache.getSharedInstance();
 
@@ -499,8 +497,7 @@
 
             if (!useZipFileIndex) {
                 zdir = new ZipFile(zipFileName);
-            }
-            else {
+            } else {
                 usePreindexedCache = options.isSet("usezipindex");
                 preindexCacheLocation = options.get("java.io.tmpdir");
                 String optCacheLoc = options.get("cachezipindexdir");