提交 e3536513 编写于 作者: J jjg

6625520: javac handles missing entries on classpath badly

Reviewed-by: mcimadamore
上级 07cc20b4
......@@ -665,7 +665,8 @@ public class JavacFileManager implements StandardJavaFileManager {
} catch (FileNotFoundException ex) {
archive = new MissingArchive(zipFileName);
} catch (IOException ex) {
log.error("error.reading.file", zipFileName, ex.getLocalizedMessage());
if (zipFileName.exists())
log.error("error.reading.file", zipFileName, ex.getLocalizedMessage());
archive = new MissingArchive(zipFileName);
}
......
......@@ -25,16 +25,13 @@
package com.sun.tools.javap;
import java.io.File;
import java.io.PrintWriter;
import java.nio.charset.Charset;
import javax.tools.Diagnostic;
import javax.tools.DiagnosticListener;
import javax.tools.JavaFileObject;
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.JCDiagnostic;
/**
* javap's implementation of JavaFileManager.
......@@ -52,29 +49,8 @@ class JavapFileManager extends JavacFileManager {
static JavapFileManager create(final DiagnosticListener<? super JavaFileObject> dl, PrintWriter log, Options options) {
Context javac_context = new Context();
if (dl != null) {
// Workaround bug 6625520: javac handles missing entries on classpath badly
// Ignore spurious errors for missing files
DiagnosticListener<JavaFileObject> wrapper = new DiagnosticListener<JavaFileObject>() {
public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
if (diagnostic instanceof JCDiagnostic) {
JCDiagnostic jcd = (JCDiagnostic) diagnostic;
if (jcd.getCode().equals("compiler.err.error.reading.file")) {
Object[] args = jcd.getArgs();
if (args.length > 0 && args[0] != null && args[0].toString().length() > 0) {
File f = new File(args[0].toString());
if (!f.exists())
return;
}
}
}
dl.report(diagnostic);
}
};
javac_context.put(DiagnosticListener.class, wrapper);
}
if (dl != null)
javac_context.put(DiagnosticListener.class, dl);
javac_context.put(com.sun.tools.javac.util.Log.outKey, log);
return new JavapFileManager(javac_context, null);
......
/*
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
import java.io.*;
import java.util.*;
import javax.tools.*;
import com.sun.tools.javac.file.*;
import com.sun.tools.javac.util.*;
/*
* @test
* @bug 6625520
* @summary javac handles missing entries on classpath badly
*/
public class T6625520 {
public static void main(String[] args) throws Exception {
new T6625520().run();
}
void run() throws Exception {
Context c = new Context();
DiagnosticCollector<JavaFileObject> dc =
new DiagnosticCollector<JavaFileObject>();
c.put(DiagnosticListener.class, dc);
StandardJavaFileManager fm = new JavacFileManager(c, false, null);
fm.setLocation(StandardLocation.CLASS_PATH,
Arrays.asList(new File("DOES_NOT_EXIST.jar")));
FileObject fo = fm.getFileForInput(StandardLocation.CLASS_PATH,
"p", "C.java");
System.err.println(fo + "\n" + dc.getDiagnostics());
if (dc.getDiagnostics().size() > 0)
throw new Exception("unexpected diagnostics found");
}
}
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册