Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_langtools
提交
e3536513
D
dragonwell8_langtools
项目概览
openanolis
/
dragonwell8_langtools
通知
0
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_langtools
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
e3536513
编写于
6月 17, 2008
作者:
J
jjg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6625520: javac handles missing entries on classpath badly
Reviewed-by: mcimadamore
上级
07cc20b4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
58 addition
and
27 deletion
+58
-27
src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
...re/classes/com/sun/tools/javac/file/JavacFileManager.java
+2
-1
src/share/classes/com/sun/tools/javap/JavapFileManager.java
src/share/classes/com/sun/tools/javap/JavapFileManager.java
+2
-26
test/tools/javac/T6625520.java
test/tools/javac/T6625520.java
+54
-0
未找到文件。
src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
浏览文件 @
e3536513
...
...
@@ -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
);
}
...
...
src/share/classes/com/sun/tools/javap/JavapFileManager.java
浏览文件 @
e3536513
...
...
@@ -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
);
...
...
test/tools/javac/T6625520.java
0 → 100644
浏览文件 @
e3536513
/*
* 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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录