Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
6c997893
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,发现更多精彩内容 >>
提交
6c997893
编写于
6月 17, 2015
作者:
H
hannesw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8087312: PropertyMapWrapper.equals should compare className
Reviewed-by: sundar, attila
上级
5436b77c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
72 addition
and
3 deletion
+72
-3
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java
...re/classes/jdk/nashorn/internal/codegen/ConstantData.java
+10
-3
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java
...are/classes/jdk/nashorn/internal/runtime/PropertyMap.java
+9
-0
nashorn/test/script/basic/JDK-8087312.js
nashorn/test/script/basic/JDK-8087312.js
+53
-0
未找到文件。
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java
浏览文件 @
6c997893
...
@@ -30,6 +30,8 @@ import java.util.Arrays;
...
@@ -30,6 +30,8 @@ import java.util.Arrays;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Objects
;
import
jdk.nashorn.internal.runtime.PropertyMap
;
import
jdk.nashorn.internal.runtime.PropertyMap
;
/**
/**
...
@@ -120,7 +122,7 @@ final class ConstantData {
...
@@ -120,7 +122,7 @@ final class ConstantData {
private
final
int
hashCode
;
private
final
int
hashCode
;
public
PropertyMapWrapper
(
final
PropertyMap
map
)
{
public
PropertyMapWrapper
(
final
PropertyMap
map
)
{
this
.
hashCode
=
Arrays
.
hashCode
(
map
.
getProperties
());
this
.
hashCode
=
Arrays
.
hashCode
(
map
.
getProperties
())
+
31
*
Objects
.
hashCode
(
map
.
getClassName
())
;
this
.
propertyMap
=
map
;
this
.
propertyMap
=
map
;
}
}
...
@@ -131,8 +133,13 @@ final class ConstantData {
...
@@ -131,8 +133,13 @@ final class ConstantData {
@Override
@Override
public
boolean
equals
(
final
Object
other
)
{
public
boolean
equals
(
final
Object
other
)
{
return
other
instanceof
PropertyMapWrapper
&&
if
(!(
other
instanceof
PropertyMapWrapper
))
{
Arrays
.
equals
(
propertyMap
.
getProperties
(),
((
PropertyMapWrapper
)
other
).
propertyMap
.
getProperties
());
return
false
;
}
final
PropertyMap
otherMap
=
((
PropertyMapWrapper
)
other
).
propertyMap
;
return
propertyMap
==
otherMap
||
(
Arrays
.
equals
(
propertyMap
.
getProperties
(),
otherMap
.
getProperties
())
&&
Objects
.
equals
(
propertyMap
.
getClassName
(),
otherMap
.
getClassName
()));
}
}
}
}
...
...
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java
浏览文件 @
6c997893
...
@@ -596,6 +596,15 @@ public final class PropertyMap implements Iterable<Object>, Serializable {
...
@@ -596,6 +596,15 @@ public final class PropertyMap implements Iterable<Object>, Serializable {
return
properties
.
getProperties
();
return
properties
.
getProperties
();
}
}
/**
* Return the name of the class of objects using this property map.
*
* @return class name of owner objects.
*/
public
String
getClassName
()
{
return
className
;
}
/**
/**
* Prevents the map from having additional properties.
* Prevents the map from having additional properties.
*
*
...
...
nashorn/test/script/basic/JDK-8087312.js
0 → 100644
浏览文件 @
6c997893
/*
* 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.
*/
/**
* JDK-8087312: PropertyMapWrapper.equals should compare className
*
* @test
* @run
* @fork
* @option -Dnashorn.debug=true
*/
function
createObject
(
type
)
{
// we want to make sure two different object literals with the same keys and types share the same property map.
if
(
type
)
{
return
{
a
:
"
a
"
,
b
:
1
,
c
:
0.1
}
}
else
{
return
{
a
:
"
x
"
,
b
:
10
,
c
:
3.4
}
}
}
var
o1
=
createObject
(
false
);
var
o2
=
createObject
(
true
);
Assert
.
assertTrue
(
Debug
.
map
(
o1
)
===
Debug
.
map
(
o2
));
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录