Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
a2f784f0
D
dragonwell11
项目概览
openanolis
/
dragonwell11
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a2f784f0
编写于
9月 27, 2017
作者:
H
hannesw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8186815: Java.from has a bug, when element is ScriptObject
Reviewed-by: sundar, jlaskey
上级
22bc46e3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
47 addition
and
2 deletion
+47
-2
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java
...hare/classes/jdk/nashorn/internal/objects/NativeJava.java
+3
-2
test/nashorn/script/basic/JDK-8186815.js
test/nashorn/script/basic/JDK-8186815.js
+44
-0
未找到文件。
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java
浏览文件 @
a2f784f0
...
...
@@ -43,6 +43,7 @@ import jdk.dynalink.beans.StaticClass;
import
jdk.dynalink.linker.support.TypeUtilities
;
import
jdk.nashorn.api.scripting.JSObject
;
import
jdk.nashorn.api.scripting.ScriptObjectMirror
;
import
jdk.nashorn.api.scripting.ScriptUtils
;
import
jdk.nashorn.internal.objects.annotations.Attribute
;
import
jdk.nashorn.internal.objects.annotations.Function
;
import
jdk.nashorn.internal.objects.annotations.ScriptClass
;
...
...
@@ -430,9 +431,9 @@ public final class NativeJava {
if
(
objArray
==
null
)
{
return
null
;
}
else
if
(
objArray
instanceof
Collection
)
{
return
new
NativeArray
(
((
Collection
<?>)
objArray
).
toArray
(
));
return
new
NativeArray
(
ScriptUtils
.
unwrapArray
(((
Collection
<?>)
objArray
).
toArray
()
));
}
else
if
(
objArray
instanceof
Object
[])
{
return
new
NativeArray
(
((
Object
[])
objArray
).
clone
(
));
return
new
NativeArray
(
ScriptUtils
.
unwrapArray
(((
Object
[])
objArray
).
clone
()
));
}
else
if
(
objArray
instanceof
int
[])
{
return
new
NativeArray
(((
int
[])
objArray
).
clone
());
}
else
if
(
objArray
instanceof
double
[])
{
...
...
test/nashorn/script/basic/JDK-8186815.js
0 → 100644
浏览文件 @
a2f784f0
/*
* Copyright (c) 2017, 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.
*/
/**
* JDK-8186815: Java.from has a bug, when element is ScriptObject
*
* @test
* @run
*/
var
list
=
new
java
.
util
.
ArrayList
();
var
obj
=
{
x
:
1
};
list
.
add
(
obj
);
Assert
.
assertTrue
(
list
.
get
(
0
)
===
obj
);
Assert
.
assertTrue
(
list
.
get
(
0
)
instanceof
Object
);
var
fromList
=
Java
.
from
(
list
);
Assert
.
assertTrue
(
fromList
[
0
]
===
obj
);
Assert
.
assertTrue
(
fromList
[
0
]
instanceof
Object
);
var
fromArray
=
Java
.
from
(
list
.
toArray
());
Assert
.
assertTrue
(
fromArray
[
0
]
===
obj
);
Assert
.
assertTrue
(
fromArray
[
0
]
instanceof
Object
);
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录