changeset 60:26531d3d6bf7

6878069: JavaFileManager does not accept binary package names using '/' on Windows Reviewed-by: darcy
author jjg
date Tue, 01 Sep 2009 15:49:27 -0700
parents 44f4635bf667
children 7daa128b9056
files src/share/classes/com/sun/tools/javac/util/JavacFileManager.java test/tools/javac/api/6431257/T6431257.java
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/util/JavacFileManager.java	Wed Jan 14 18:08:00 2009 -0800
+++ b/src/share/classes/com/sun/tools/javac/util/JavacFileManager.java	Tue Sep 01 15:49:27 2009 -0700
@@ -918,7 +918,8 @@
         Iterable<? extends File> path = getLocation(location);
         if (path == null)
             return List.nil();
-        String subdirectory = externalizeFileName(packageName);
+	// allow use of binary package names, per the JavaFileManager spec
+        String subdirectory = externalizeFileName(packageName.replace('/', '.'));
         ListBuffer<JavaFileObject> results = new ListBuffer<JavaFileObject>();
 
         for (File directory : path)
--- a/test/tools/javac/api/6431257/T6431257.java	Wed Jan 14 18:08:00 2009 -0800
+++ b/test/tools/javac/api/6431257/T6431257.java	Tue Sep 01 15:49:27 2009 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug     6431257
+ * @bug     6431257 6878069
  * @summary JSR 199: Changes to JavaFileManager to support JSR 269 Filer API
  * @author  Peter von der Ah\u00e9
  * @library ../lib