提交 ab869bd6 编写于 作者: M michaelm

7003398: NetworkInterface equals() and hashCode() behaviors depend on permissions granted

Reviewed-by: chegar, alanb
上级 db6d6387
...@@ -493,55 +493,44 @@ public final class NetworkInterface { ...@@ -493,55 +493,44 @@ public final class NetworkInterface {
* @see java.net.InetAddress#getAddress() * @see java.net.InetAddress#getAddress()
*/ */
public boolean equals(Object obj) { public boolean equals(Object obj) {
if ((obj == null) || !(obj instanceof NetworkInterface)) { if (!(obj instanceof NetworkInterface)) {
return false; return false;
} }
NetworkInterface netIF = (NetworkInterface)obj; NetworkInterface that = (NetworkInterface)obj;
if (name != null ) { if (this.name != null ) {
if (netIF.getName() != null) { if (!this.name.equals(that.name)) {
if (!name.equals(netIF.getName())) {
return false;
}
} else {
return false; return false;
} }
} else { } else {
if (netIF.getName() != null) { if (that.name != null) {
return false; return false;
} }
} }
Enumeration newAddrs = netIF.getInetAddresses();
int i = 0; if (this.addrs == null) {
for (i = 0; newAddrs.hasMoreElements();newAddrs.nextElement(), i++); return that.addrs == null;
if (addrs == null) { } else if (that.addrs == null) {
if (i != 0) { return false;
return false; }
}
} else { /* Both addrs not null. Compare number of addresses */
/*
* Compare number of addresses (in the checked subset) if (this.addrs.length != that.addrs.length) {
*/ return false;
int count = 0;
Enumeration e = getInetAddresses();
for (; e.hasMoreElements(); count++) {
e.nextElement();
}
if (i != count) {
return false;
}
} }
newAddrs = netIF.getInetAddresses();
for (; newAddrs.hasMoreElements();) { InetAddress[] thatAddrs = that.addrs;
boolean equal = false; int count = thatAddrs.length;
Enumeration thisAddrs = getInetAddresses();
InetAddress newAddr = (InetAddress)newAddrs.nextElement(); for (int i=0; i<count; i++) {
for (; thisAddrs.hasMoreElements();) { boolean found = false;
InetAddress thisAddr = (InetAddress)thisAddrs.nextElement(); for (int j=0; j<count; j++) {
if (thisAddr.equals(newAddr)) { if (addrs[i].equals(thatAddrs[j])) {
equal = true; found = true;
break;
} }
} }
if (!equal) { if (!found) {
return false; return false;
} }
} }
...@@ -549,12 +538,7 @@ public final class NetworkInterface { ...@@ -549,12 +538,7 @@ public final class NetworkInterface {
} }
public int hashCode() { public int hashCode() {
int count = name == null? 0: name.hashCode(); return name == null? 0: name.hashCode();
Enumeration<InetAddress> addrs = getInetAddresses();
while (addrs.hasMoreElements()) {
count += addrs.nextElement().hashCode();
}
return count;
} }
public String toString() { public String toString() {
......
/*
* 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.
先完成此消息的编辑!
想要评论请 注册