diff -r d8e9b6d6ccee -r 06e42328ddab langtools/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java
--- a/langtools/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java	Thu Feb 24 08:40:49 2011 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java	Fri Feb 25 12:09:33 2011 -0800
@@ -44,13 +44,13 @@
 public class CacheFSInfo extends FSInfo {
 
     /**
-     * Register a Context.Factory to create a singleton CacheFSInfo.
+     * Register a Context.Factory to create a CacheFSInfo.
      */
-    public static void preRegister(final Context context) {
+    public static void preRegister(Context context) {
         context.put(FSInfo.class, new Context.Factory<FSInfo>() {
-            public FSInfo make() {
+            public FSInfo make(Context c) {
                 FSInfo instance = new CacheFSInfo();
-                context.put(FSInfo.class, instance);
+                c.put(FSInfo.class, instance);
                 return instance;
             }
         });