Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
42c4fa97
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
42c4fa97
编写于
2月 03, 2015
作者:
D
dmarkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8064934: Incorrect Exception message from java.awt.Desktop.open()
Reviewed-by: azvegint, serb
上级
4a30f326
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
85 addition
and
1 deletion
+85
-1
src/windows/native/sun/windows/awt_Desktop.cpp
src/windows/native/sun/windows/awt_Desktop.cpp
+2
-1
test/java/awt/Desktop/8064934/bug8064934.java
test/java/awt/Desktop/8064934/bug8064934.java
+83
-0
未找到文件。
src/windows/native/sun/windows/awt_Desktop.cpp
浏览文件 @
42c4fa97
...
...
@@ -52,6 +52,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_windows_WDesktopPeer_ShellExecute
// 6457572: ShellExecute possibly changes FPU control word - saving it here
unsigned
oldcontrol87
=
_control87
(
0
,
0
);
HINSTANCE
retval
=
::
ShellExecute
(
NULL
,
verb_c
,
fileOrUri_c
,
NULL
,
NULL
,
SW_SHOWNORMAL
);
DWORD
error
=
::
GetLastError
();
_control87
(
oldcontrol87
,
0xffffffff
);
JNU_ReleaseStringPlatformChars
(
env
,
fileOrUri_j
,
fileOrUri_c
);
...
...
@@ -65,7 +66,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_windows_WDesktopPeer_ShellExecute
FORMAT_MESSAGE_FROM_SYSTEM
|
FORMAT_MESSAGE_IGNORE_INSERTS
,
NULL
,
(
int
)
retval
,
error
,
MAKELANGID
(
LANG_NEUTRAL
,
SUBLANG_DEFAULT
),
// Default language
(
LPTSTR
)
&
buffer
,
0
,
...
...
test/java/awt/Desktop/8064934/bug8064934.java
0 → 100644
浏览文件 @
42c4fa97
/*
* Copyright (c) 2015, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
* @bug 8064934
* @summary Incorrect Exception message from java.awt.Desktop.open()
* @author Dmitry Markov
* @run main bug8064934
*/
import
sun.awt.OSInfo
;
import
java.awt.*
;
import
java.io.File
;
import
java.io.IOException
;
import
java.security.AccessController
;
public
class
bug8064934
{
private
static
final
String
NO_ASSOCIATION_ERROR_MESSAGE
=
"Error message: No application is associated with"
+
" the specified file for this operation."
;
public
static
void
main
(
String
[]
args
)
{
// This test is intended only for Windows
if
(
AccessController
.
doPrivileged
(
OSInfo
.
getOSTypeAction
())
!=
OSInfo
.
OSType
.
WINDOWS
)
{
System
.
out
.
println
(
"The test is for Windows platform only"
);
return
;
}
// Test whether Desktop is supported of not
if
(!
Desktop
.
isDesktopSupported
())
{
System
.
out
.
println
(
"Desktop is not supported"
);
return
;
}
Desktop
desktop
=
Desktop
.
getDesktop
();
// Test whether open action is supported or not
if
(!
desktop
.
isSupported
(
Desktop
.
Action
.
OPEN
))
{
System
.
out
.
println
(
"Desktop.Action.OPEN is not supported"
);
return
;
}
File
file
=
null
;
try
{
file
=
File
.
createTempFile
(
"test"
,
".foo"
);
if
(!
file
.
exists
())
{
throw
new
RuntimeException
(
"Can not create temp file"
);
}
desktop
.
open
(
file
);
}
catch
(
IOException
ioe
)
{
String
errorMessage
=
ioe
.
getMessage
().
trim
();
if
(
errorMessage
!=
null
&&
!
errorMessage
.
endsWith
(
NO_ASSOCIATION_ERROR_MESSAGE
))
{
throw
new
RuntimeException
(
"Test FAILED! Wrong Error message: \n"
+
"Actual "
+
errorMessage
.
substring
(
errorMessage
.
indexOf
(
"Error message:"
))
+
"\n"
+
"Expected "
+
NO_ASSOCIATION_ERROR_MESSAGE
);
}
}
finally
{
if
(
file
!=
null
)
{
file
.
delete
();
}
}
System
.
out
.
println
(
"Test PASSED!"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录