diff -r e992e602788e -r 49359d0e6a9c src/share/classes/com/sun/tools/javac/util/Log.java
--- a/src/share/classes/com/sun/tools/javac/util/Log.java	Wed Sep 23 18:29:41 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/Log.java	Wed Sep 23 18:48:13 2009 -0700
@@ -33,7 +33,6 @@
 import javax.tools.DiagnosticListener;
 import javax.tools.JavaFileObject;
 
-import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.api.DiagnosticFormatter;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
@@ -428,7 +427,7 @@
             JavaFileObject file = source.getFile();
             if (file != null)
                 printLines(errWriter,
-                           JavacFileManager.getJavacFileName(file) + ":" +
+                           file.getName() + ":" +
                            line + ": " + msg);
             printErrLine(pos, errWriter);
         }