Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
ab869bd6
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,发现更多精彩内容 >>
提交
ab869bd6
编写于
1月 13, 2011
作者:
M
michaelm
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
7003398: NetworkInterface equals() and hashCode() behaviors depend on permissions granted
Reviewed-by: chegar, alanb
上级
db6d6387
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
93 addition
and
44 deletion
+93
-44
src/share/classes/java/net/NetworkInterface.java
src/share/classes/java/net/NetworkInterface.java
+28
-44
test/java/net/NetworkInterface/Equals.java
test/java/net/NetworkInterface/Equals.java
+65
-0
未找到文件。
src/share/classes/java/net/NetworkInterface.java
浏览文件 @
ab869bd6
...
...
@@ -493,55 +493,44 @@ public final class NetworkInterface {
* @see java.net.InetAddress#getAddress()
*/
public
boolean
equals
(
Object
obj
)
{
if
(
(
obj
==
null
)
||
!(
obj
instanceof
NetworkInterface
))
{
if
(!(
obj
instanceof
NetworkInterface
))
{
return
false
;
}
NetworkInterface
netIF
=
(
NetworkInterface
)
obj
;
if
(
name
!=
null
)
{
if
(
netIF
.
getName
()
!=
null
)
{
if
(!
name
.
equals
(
netIF
.
getName
()))
{
return
false
;
}
}
else
{
NetworkInterface
that
=
(
NetworkInterface
)
obj
;
if
(
this
.
name
!=
null
)
{
if
(!
this
.
name
.
equals
(
that
.
name
))
{
return
false
;
}
}
else
{
if
(
netIF
.
getName
()
!=
null
)
{
if
(
that
.
name
!=
null
)
{
return
false
;
}
}
Enumeration
newAddrs
=
netIF
.
getInetAddresses
();
int
i
=
0
;
for
(
i
=
0
;
newAddrs
.
hasMoreElements
();
newAddrs
.
nextElement
(),
i
++);
if
(
addrs
==
null
)
{
if
(
i
!=
0
)
{
return
false
;
}
}
else
{
/*
* Compare number of addresses (in the checked subset)
*/
int
count
=
0
;
Enumeration
e
=
getInetAddresses
();
for
(;
e
.
hasMoreElements
();
count
++)
{
e
.
nextElement
();
}
if
(
i
!=
count
)
{
return
false
;
}
if
(
this
.
addrs
==
null
)
{
return
that
.
addrs
==
null
;
}
else
if
(
that
.
addrs
==
null
)
{
return
false
;
}
/* Both addrs not null. Compare number of addresses */
if
(
this
.
addrs
.
length
!=
that
.
addrs
.
length
)
{
return
false
;
}
newAddrs
=
netIF
.
getInetAddresses
();
for
(;
newAddrs
.
hasMoreElements
();)
{
boolean
equal
=
false
;
Enumeration
thisAddrs
=
getInetAddresses
();
InetAddress
newAddr
=
(
InetAddress
)
newAddrs
.
nextElement
();
for
(;
thisAddrs
.
hasMoreElements
();)
{
InetAddress
thisAddr
=
(
InetAddress
)
thisAddrs
.
nextElement
();
if
(
thisAddr
.
equals
(
newAddr
))
{
equal
=
true
;
InetAddress
[]
thatAddrs
=
that
.
addrs
;
int
count
=
thatAddrs
.
length
;
for
(
int
i
=
0
;
i
<
count
;
i
++)
{
boolean
found
=
false
;
for
(
int
j
=
0
;
j
<
count
;
j
++)
{
if
(
addrs
[
i
].
equals
(
thatAddrs
[
j
]))
{
found
=
true
;
break
;
}
}
if
(!
equal
)
{
if
(!
found
)
{
return
false
;
}
}
...
...
@@ -549,12 +538,7 @@ public final class NetworkInterface {
}
public
int
hashCode
()
{
int
count
=
name
==
null
?
0
:
name
.
hashCode
();
Enumeration
<
InetAddress
>
addrs
=
getInetAddresses
();
while
(
addrs
.
hasMoreElements
())
{
count
+=
addrs
.
nextElement
().
hashCode
();
}
return
count
;
return
name
==
null
?
0
:
name
.
hashCode
();
}
public
String
toString
()
{
...
...
test/java/net/NetworkInterface/Equals.java
0 → 100644
浏览文件 @
ab869bd6
/*
* Copyright (c) 2011, 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 7003398
* @run main/othervm Equals
*/
import
java.net.NetworkInterface
;
import
java.net.InetAddress
;
import
java.util.Enumeration
;
import
java.util.HashMap
;
public
class
Equals
{
public
static
void
main
(
String
args
[])
throws
Exception
{
Enumeration
nifs1
=
NetworkInterface
.
getNetworkInterfaces
();
HashMap
<
String
,
Integer
>
hashes
=
new
HashMap
<>();
HashMap
<
String
,
NetworkInterface
>
nicMap
=
new
HashMap
<>();
while
(
nifs1
.
hasMoreElements
())
{
NetworkInterface
ni
=
(
NetworkInterface
)
nifs1
.
nextElement
();
hashes
.
put
(
ni
.
getName
(),
ni
.
hashCode
());
nicMap
.
put
(
ni
.
getName
(),
ni
);
}
System
.
setSecurityManager
(
new
SecurityManager
());
Enumeration
nifs2
=
NetworkInterface
.
getNetworkInterfaces
();
while
(
nifs2
.
hasMoreElements
())
{
NetworkInterface
ni
=
(
NetworkInterface
)
nifs2
.
nextElement
();
NetworkInterface
niOrig
=
nicMap
.
get
(
ni
.
getName
());
int
h
=
hashes
.
get
(
ni
.
getName
());
if
(
h
!=
ni
.
hashCode
())
{
throw
new
RuntimeException
(
"Hashcodes different for "
+
ni
.
getName
());
}
if
(!
ni
.
equals
(
niOrig
))
{
throw
new
RuntimeException
(
"equality different for "
+
ni
.
getName
());
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录